【增加】学工信息管理：增加学生违纪管理；

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuDisciplineManagementController.cs

@@ -0,0 +1,133 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using System.Web.Mvc;
+using Learun.Application.TwoDevelopment.LR_CodeDemo;
+using System.Collections.Generic;
+
+namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-03-26 15:23
+    /// 描 述：学生违纪管理
+    /// </summary>
+    public class StuDisciplineManagementController : MvcControllerBase
+    {
+        private StuDisciplineManagementIBLL stuDisciplineManagementIBLL = new StuDisciplineManagementBLL();
+
+        #region 视图功能
+
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Index()
+        {
+             return View();
+        }
+        /// <summary>
+        /// 表单页
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult Form()
+        {
+             return View();
+        }
+        #endregion
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageList(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = stuDisciplineManagementIBLL.GetPageList(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormData(string keyValue)
+        {
+            var StuDisciplineManagementData = stuDisciplineManagementIBLL.GetStuDisciplineManagementEntity( keyValue );
+            var jsonData = new {
+                StuDisciplineManagement = StuDisciplineManagementData,
+            };
+            return Success(jsonData);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// </summary>
+        /// <param name="processId">流程实例主键</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetFormDataByProcessId(string processId)
+        {
+            var StuDisciplineManagementData = stuDisciplineManagementIBLL.GetEntityByProcessId( processId );
+            var jsonData = new {
+                StuDisciplineManagement = StuDisciplineManagementData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            stuDisciplineManagementIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="strEntity">实体</param>
+        /// <returns></returns>
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [AjaxOnly]
+        public ActionResult SaveForm(string keyValue, string strEntity)
+        {
+            StuDisciplineManagementEntity entity = strEntity.ToObject<StuDisciplineManagementEntity>();
+            stuDisciplineManagementIBLL.SaveEntity(keyValue,entity);
+            if (string.IsNullOrEmpty(keyValue))
+            {
+            }
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoBasicController.cs

@@ -184,6 +184,18 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             };
             return Success(jsonData);
         }
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetAllList()
+        {
+            var data = stuInfoBasicIBLL.GetAllList();
+            return Success(data);
+        }
         /// <summary>
         /// 获取表单数据
         /// <summary>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuDisciplineManagement/Form.cshtml

@@ -0,0 +1,39 @@
+@{
+    ViewBag.Title = "学生违纪管理";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-6 lr-form-item"  data-table="StuDisciplineManagement" >
+        <div class="lr-form-item-title">违纪学生<font face="宋体">*</font></div>
+        <div id="StuNo" isvalid="yes" checkexpession="NotNull" ></div>
+    </div>
+    <div class="col-xs-6 lr-form-item"  data-table="StuDisciplineManagement" >
+        <div class="lr-form-item-title">违纪时间<font face="宋体">*</font></div>
+        <input id="DisciplineTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm',onpicked: function () { $('#DisciplineTime').trigger('change'); } })"  isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-6 lr-form-item"  data-table="StuDisciplineManagement" >
+        <div class="lr-form-item-title">处理老师<font face="宋体">*</font></div>
+        <div id="EmpNo" isvalid="yes" checkexpession="NotNull" ></div>
+    </div>
+    <div class="col-xs-6 lr-form-item"  data-table="StuDisciplineManagement" >
+        <div class="lr-form-item-title">处理时间</div>
+        <input id="DealTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm',onpicked: function () { $('#DealTime').trigger('change'); } })"   />
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="StuDisciplineManagement" >
+        <div class="lr-form-item-title">事情经过</div>
+        <textarea id="Things" class="form-control" style="height:100px;"  ></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="StuDisciplineManagement" >
+        <div class="lr-form-item-title">学生态度</div>
+        <textarea id="StudentAttitude" class="form-control" style="height:100px;"  ></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="StuDisciplineManagement" >
+        <div class="lr-form-item-title">班主任意见</div>
+        <textarea id="TeacherOpinion" class="form-control" style="height:100px;"  ></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="StuDisciplineManagement" >
+        <div class="lr-form-item-title">家长意见</div>
+        <textarea id="ParentsOpinion" class="form-control" style="height:100px;"  ></textarea>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuDisciplineManagement/Form.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuDisciplineManagement/Form.js

@@ -0,0 +1,106 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-03-26 15:23
+ * 描  述：学生违纪管理
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+// 设置权限
+var setAuthorize;
+// 设置表单数据
+var setFormData;
+// 验证数据是否填写完整
+var validForm;
+// 保存数据
+var save;
+var bootstrap = function ($, learun) {
+    "use strict";
+    // 设置权限
+    setAuthorize = function (data) {
+                            if(!!data)
+                            {
+                                for (var field in data) {
+                                    if (data[field].isLook != 1) {// 如果没有查看权限就直接移除
+                                        $('#' + data[field].fieldId).parent().remove();
+                                    }
+                                    else {
+                                        if (data[field].isEdit != 1) {
+                                            $('#' + data[field].fieldId).attr('disabled', 'disabled');
+                                            if ($('#' + data[field].fieldId).hasClass('lrUploader-wrap')) {
+                                                $('#' + data[field].fieldId).css({ 'padding-right': '58px' });
+                                                $('#' + data[field].fieldId).find('.btn-success').remove();
+                                            }
+                                        }
+                                    }
+                                }
+                                }
+                            };    
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            $('#StuNo').lrDataSourceSelect({ code: 'StuInfoBasic',value: 'stuno',text: 'stuname' });
+            $('#EmpNo').lrDataSourceSelect({ code: 'EmpInfo',value: 'empno',text: 'empname' });
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/StuDisciplineManagement/GetFormData?keyValue=' + keyValue, function (data) {
+                    for (var id in data) {
+                        if (!!data[id].length && data[id].length > 0) {
+                            $('#' + id ).jfGridSet('refreshdata', data[id]);
+                        }
+                        else {
+                            $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                        }
+                    }
+                });
+            }
+        }
+    };
+    // 设置表单数据
+    setFormData = function (processId,param,callback) {
+        if (!!processId) {
+            $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/StuDisciplineManagement/GetFormDataByProcessId?processId=' + processId, function (data) {
+                for (var id in data) {
+                    if (!!data[id] && data[id].length > 0) {
+                            $('#' + id ).jfGridSet('refreshdata', data[id]);
+                        }
+                        else {
+                        if(id == 'StuDisciplineManagement' && data[id] ){
+                            keyValue = data[id].Id;
+                        }
+                            $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                        }
+                    }
+                });
+            }
+                callback && callback();        }
+    // 验证数据是否填写完整
+    validForm = function () {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        return true;
+    };
+    // 保存数据
+    save = function (processId, callBack, i) {
+        var formData = $('body').lrGetFormData();
+        if(!!processId){
+            formData.ProcessId =processId;
+        }
+        var postData = {
+            strEntity: JSON.stringify(formData)
+        };
+        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuDisciplineManagement/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack(res, i);
+            }
+        });
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuDisciplineManagement/Index.cshtml

@@ -0,0 +1,44 @@
+@{
+    ViewBag.Title = "学生违纪管理";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout "  >
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <div id="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">违纪学生</div>
+                                    <div id="StuNo"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">处理老师</div>
+                                    <div id="EmpNo"></div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_add"   class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;新增</a>
+                        <a id="lr_edit"  class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;编辑</a>
+                        <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
+                    </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_view"   class="btn btn-default"><i class="fa fa-plus"></i>&nbsp; 查看</a>
+                        <a id="lr_submit"   class="btn btn-default"><i class="fa fa-plus"></i>&nbsp; 提交</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuDisciplineManagement/Index.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuDisciplineManagement/Index.js

@@ -0,0 +1,162 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-03-26 15:23
+ * 描  述：学生违纪管理
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var processId = '';
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 220, 400);
+            $('#StuNo').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GetAllList',
+                param: { strWhere: "1=1 " },
+                value: "stuno",
+                text: "stuname"
+            });
+            //$('#StuNo').lrDataSourceSelect({ code: 'StuInfoBasic',value: 'stuno',text: 'stuname' });
+            $('#EmpNo').lrDataSourceSelect({ code: 'EmpInfo',value: 'empno',text: 'empname' });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 新增
+            $('#lr_add').on('click', function () {
+                learun.layerForm({
+                    id: 'form',
+                    title: '新增',
+                    url: top.$.rootUrl + '/EducationalAdministration/StuDisciplineManagement/Form',
+                    width: 600,
+                    height: 400,
+                    callBack: function (id) {
+                        var res = false;
+                        // 验证数据
+                        res = top[id].validForm();
+                        // 保存数据
+                        if (res) {
+                            processId = learun.newGuid();
+                            res = top[id].save(processId, refreshGirdData);
+                        }
+                        return res;
+                    }
+                });
+            });
+            // 编辑
+            $('#lr_edit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'form',
+                        title: '编辑',
+                        url: top.$.rootUrl + '/EducationalAdministration/StuDisciplineManagement/Form?keyValue=' + keyValue,
+                        width: 600,
+                        height: 400,
+                        callBack: function (id) {
+                            var res = false;
+                            // 验证数据
+                            res = top[id].validForm();
+                            // 保存数据
+                            if (res) {
+                                res = top[id].save('', function () {
+                                    page.search();
+                                });
+                            }
+                            return res;
+                        }
+                    });
+                }
+            });
+            // 删除
+            $('#lr_delete').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerConfirm('是否确认删除该项！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/StuDisciplineManagement/DeleteForm', { keyValue: keyValue}, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            //  查看
+            $('#lr_view').on('click', function () {
+            });
+            //  提交
+            $('#lr_submit').on('click', function () {
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/StuDisciplineManagement/GetPageList',
+                headData: [
+                    { label: "违纪学生", name: "StuNo", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op,$cell) {
+                             learun.clientdata.getAsync('custmerData', {
+                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'StuInfoBasic',
+                                 key: value,
+                                 keyId: 'stuno',
+                                 callback: function (_data) {
+                                     callback(_data['stuname']);
+                                 }
+                             });
+                        }},
+                    { label: "违纪时间", name: "DisciplineTime", width: 120, align: "left"},
+                    { label: "处理老师", name: "EmpNo", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op,$cell) {
+                             learun.clientdata.getAsync('custmerData', {
+                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'EmpInfo',
+                                 key: value,
+                                 keyId: 'empno',
+                                 callback: function (_data) {
+                                     callback(_data['empname']);
+                                 }
+                             });
+                        }},
+                    { label: "处理时间", name: "DealTime", width: 120, align: "left"},
+                    { label: "事情经过", name: "Things", width: 100, align: "left"},
+                    { label: "学生态度", name: "StudentAttitude", width: 100, align: "left"},
+                    { label: "班主任意见", name: "TeacherOpinion", width: 100, align: "left"},
+                    { label: "家长意见", name: "ParentsOpinion", width: 100, align: "left"},
+                ],
+                mainId:'Id',
+                isPage: true
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function (res, postData) {
+        if (!!res)
+        {
+          if (res.code == 200)
+          {
+             // 发起流程
+             var postData = {
+                  schemeCode:'',// 填写流程对应模板编号
+                  processId:processId,
+                  level:'1',
+             };
+             learun.httpAsync('Post', top.$.rootUrl + '/LR_NewWorkFlow/NWFProcess/CreateFlow', postData, function(data) {
+                 learun.loading(false);
+             });
+        }
+       page.search();
+       }
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj

@@ -796,6 +796,7 @@
     <Compile Include="Areas\PersonnelManagement\Controllers\TeacherCancelLeaveManagementController.cs" />
     <Compile Include="Areas\PersonnelManagement\Controllers\TeacherOvertimeManagementController.cs" />
     <Compile Include="Areas\EducationalAdministration\Controllers\StuCancelLeaveManagementController.cs" />
+    <Compile Include="Areas\EducationalAdministration\Controllers\StuDisciplineManagementController.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Areas\AdmissionsPlatform\Views\AP_OnlineUserInfo\DropOutIndex.js" />
@@ -6150,6 +6151,10 @@
     <Content Include="Areas\EducationalAdministration\Views\StuCancelLeaveManagement\Index.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuCancelLeaveManagement\Form.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\StuCancelLeaveManagement\Form.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StuDisciplineManagement\Index.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StuDisciplineManagement\Index.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StuDisciplineManagement\Form.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StuDisciplineManagement\Form.js" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Areas\LR_Desktop\Models\" />

Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/system.config

@@ -61,7 +61,7 @@
   <!-- ================== 6：即时通信参数 ================== -->
   <!-- SignalR服务接口-->
   <add key="IMUrl" value="http://localhost:8012/signalr" />
-  <add key="IMOpen" value="true" />
+  <add key="IMOpen" value="false" />
 
   <add key="userKey" value="14B417B0-463D-4F2B-8075-0A20EEDB773A" />
   <!-- ==================注意附件上传地址  修改到部署目录下的Resource要不然飞星会报错================== -->

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/StuDisciplineManagementMap.cs

@@ -0,0 +1,29 @@
+using Learun.Application.TwoDevelopment.EducationalAdministration;
+using System.Data.Entity.ModelConfiguration;
+
+namespace  Learun.Application.Mapping
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-03-26 15:23
+    /// 描 述：学生违纪管理
+    /// </summary>
+    public class StuDisciplineManagementMap : EntityTypeConfiguration<StuDisciplineManagementEntity>
+    {
+        public StuDisciplineManagementMap()
+        {
+            #region 表、主键
+            //表
+            this.ToTable("STUDISCIPLINEMANAGEMENT");
+            //主键
+            this.HasKey(t => t.Id);
+            #endregion
+
+            #region 配置关系
+            #endregion
+        }
+    }
+}
+

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj

@@ -548,6 +548,7 @@
     <Compile Include="PersonnelManagement\TeacherCancelLeaveManagementMap.cs" />
     <Compile Include="PersonnelManagement\TeacherOvertimeManagementMap.cs" />
     <Compile Include="EducationalAdministration\StuCancelLeaveManagementMap.cs" />
+    <Compile Include="EducationalAdministration\StuDisciplineManagementMap.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Learun.Application.Organization\Learun.Application.Organization.csproj">

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/DBModel/资产系统.PDM

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?PowerDesigner AppLocale="UTF16" ID="{88086B01-C9E1-11D4-9552-0090277716A9}" Label="" LastModificationDate="1616741944" Name="Physical Data Model 1" Objects="3346" Symbols="383" Target="Microsoft SQL Server 2008" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
+<?PowerDesigner AppLocale="UTF16" ID="{88086B01-C9E1-11D4-9552-0090277716A9}" Label="" LastModificationDate="1616742295" Name="Physical Data Model 1" Objects="3346" Symbols="383" Target="Microsoft SQL Server 2008" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
 <!-- do not edit this file -->
 
 <Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@@ -48857,10 +48857,11 @@ B9AF
 <a:Code>EmpNo</a:Code>
 <a:CreationDate>1581043699</a:CreationDate>
 <a:Creator>edz</a:Creator>
-<a:ModificationDate>1616741941</a:ModificationDate>
+<a:ModificationDate>1616742295</a:ModificationDate>
 <a:Modifier>edz</a:Modifier>
 <a:Comment>处理老师</a:Comment>
-<a:DataType>nvarchar(0)</a:DataType>
+<a:DataType>nvarchar(50)</a:DataType>
+<a:Length>50</a:Length>
 </o:Column>
 <o:Column Id="o3263">
 <a:ObjectID>7B2892D6-48E2-4533-BC8C-1168C85DD96B</a:ObjectID>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuDisciplineManagement/StuDisciplineManagementBLL.cs

@@ -0,0 +1,148 @@
+using Learun.Util;
+using System;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-03-26 15:23
+    /// 描 述：学生违纪管理
+    /// </summary>
+    public class StuDisciplineManagementBLL : StuDisciplineManagementIBLL
+    {
+        private StuDisciplineManagementService stuDisciplineManagementService = new StuDisciplineManagementService();
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<StuDisciplineManagementEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return stuDisciplineManagementService.GetPageList(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取StuDisciplineManagement表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public StuDisciplineManagementEntity GetStuDisciplineManagementEntity(string keyValue)
+        {
+            try
+            {
+                return stuDisciplineManagementService.GetStuDisciplineManagementEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取主表实体数据
+        /// </summary>
+        /// <param name="processId">流程实例ID</param>
+        /// <returns></returns>
+        public StuDisciplineManagementEntity GetEntityByProcessId(string processId)
+        {
+            try
+            {
+                return stuDisciplineManagementService.GetEntityByProcessId(processId);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void DeleteEntity(string keyValue)
+        {
+            try
+            {
+                stuDisciplineManagementService.DeleteEntity(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        public void SaveEntity(string keyValue, StuDisciplineManagementEntity entity)
+        {
+            try
+            {
+                stuDisciplineManagementService.SaveEntity(keyValue, entity);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuDisciplineManagement/StuDisciplineManagementEntity.cs

@@ -0,0 +1,120 @@
+using Learun.Util;
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-03-26 15:23
+    /// 描 述：学生违纪管理
+    /// </summary>
+    public class StuDisciplineManagementEntity 
+    {
+        #region 实体成员
+        /// <summary>
+        /// Id
+        /// </summary>
+        [Column("ID")]
+        public string Id { get; set; }
+        /// <summary>
+        /// 违纪学生
+        /// </summary>
+        [Column("STUNO")]
+        public string StuNo { get; set; }
+        /// <summary>
+        /// 违纪时间
+        /// </summary>
+        [Column("DISCIPLINETIME")]
+        public DateTime? DisciplineTime { get; set; }
+        /// <summary>
+        /// 处理老师
+        /// </summary>
+        [Column("EMPNO")]
+        public string EmpNo { get; set; }
+        /// <summary>
+        /// 处理时间
+        /// </summary>
+        [Column("DEALTIME")]
+        public DateTime? DealTime { get; set; }
+        /// <summary>
+        /// 事情经过
+        /// </summary>
+        [Column("THINGS")]
+        public string Things { get; set; }
+        /// <summary>
+        /// 学生态度
+        /// </summary>
+        [Column("STUDENTATTITUDE")]
+        public string StudentAttitude { get; set; }
+        /// <summary>
+        /// 班主任意见
+        /// </summary>
+        [Column("TEACHEROPINION")]
+        public string TeacherOpinion { get; set; }
+        /// <summary>
+        /// 家长意见
+        /// </summary>
+        [Column("PARENTSOPINION")]
+        public string ParentsOpinion { get; set; }
+        /// <summary>
+        /// 创建用户
+        /// </summary>
+        [Column("CREATEUSERID")]
+        public string CreateUserId { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column("CREATETIME")]
+        public DateTime? CreateTime { get; set; }
+        /// <summary>
+        /// 审核状态
+        /// </summary>
+        [Column("CHECKSTATUS")]
+        public string CheckStatus { get; set; }
+        /// <summary>
+        /// 审核备注
+        /// </summary>
+        [Column("CHECKREMARK")]
+        public string CheckRemark { get; set; }
+        /// <summary>
+        /// 审核人
+        /// </summary>
+        [Column("CHECKUSERID")]
+        public string CheckUserId { get; set; }
+        /// <summary>
+        /// 审核时间
+        /// </summary>
+        [Column("CHECKTIME")]
+        public DateTime? CheckTime { get; set; }
+        /// <summary>
+        /// 流程Id
+        /// </summary>
+        [Column("PROCESSID")]
+        public string ProcessId { get; set; }
+        #endregion
+
+        #region 扩展操作
+        /// <summary>
+        /// 新增调用
+        /// </summary>
+        public void Create()
+        {
+            this.Id = Guid.NewGuid().ToString();
+        }
+        /// <summary>
+        /// 编辑调用
+        /// </summary>
+        /// <param name="keyValue"></param>
+        public void Modify(string keyValue)
+        {
+            this.Id = keyValue;
+        }
+        #endregion
+        #region 扩展字段
+        #endregion
+    }
+}
+

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuDisciplineManagement/StuDisciplineManagementIBLL.cs

@@ -0,0 +1,55 @@
+using Learun.Util;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-03-26 15:23
+    /// 描 述：学生违纪管理
+    /// </summary>
+    public interface StuDisciplineManagementIBLL
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        IEnumerable<StuDisciplineManagementEntity> GetPageList(Pagination pagination, string queryJson);
+        /// <summary>
+        /// 获取StuDisciplineManagement表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        StuDisciplineManagementEntity GetStuDisciplineManagementEntity(string keyValue);
+        /// <summary>
+        /// 获取主表实体数据
+        /// </summary>
+        /// <param name="processId">流程实例ID</param>
+        /// <returns></returns>
+        StuDisciplineManagementEntity GetEntityByProcessId(string processId);
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        void DeleteEntity(string keyValue);
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        void SaveEntity(string keyValue, StuDisciplineManagementEntity entity);
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuDisciplineManagement/StuDisciplineManagementService.cs

@@ -0,0 +1,187 @@
+using Dapper;
+using Learun.DataBase.Repository;
+using Learun.Util;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Text;
+
+namespace Learun.Application.TwoDevelopment.EducationalAdministration
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2021-03-26 15:23
+    /// 描 述：学生违纪管理
+    /// </summary>
+    public class StuDisciplineManagementService : RepositoryFactory
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<StuDisciplineManagementEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT ");
+                strSql.Append(@"
+                t.Id,
+                t.StuNo,
+                t.DisciplineTime,
+                t.EmpNo,
+                t.DealTime,
+                t.Things,
+                t.StudentAttitude,
+                t.TeacherOpinion,
+                t.ParentsOpinion
+                ");
+                strSql.Append("  FROM StuDisciplineManagement t ");
+                strSql.Append("  WHERE 1=1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["StuNo"].IsEmpty())
+                {
+                    dp.Add("StuNo",queryParam["StuNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.StuNo = @StuNo ");
+                }
+                if (!queryParam["EmpNo"].IsEmpty())
+                {
+                    dp.Add("EmpNo",queryParam["EmpNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.EmpNo = @EmpNo ");
+                }
+                return this.BaseRepository("CollegeMIS").FindList<StuDisciplineManagementEntity>(strSql.ToString(),dp, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取StuDisciplineManagement表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public StuDisciplineManagementEntity GetStuDisciplineManagementEntity(string keyValue)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<StuDisciplineManagementEntity>(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取主表实体数据
+        /// </summary>
+        /// <param name="processId">流程实例ID</param>
+        /// <returns></returns>
+        public StuDisciplineManagementEntity GetEntityByProcessId(string processId)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<StuDisciplineManagementEntity>(t=>t.ProcessId == processId);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        public void DeleteEntity(string keyValue)
+        {
+            try
+            {
+                this.BaseRepository("CollegeMIS").Delete<StuDisciplineManagementEntity>(t=>t.Id == keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <param name="entity">实体</param>
+        /// <returns></returns>
+        public void SaveEntity(string keyValue, StuDisciplineManagementEntity entity)
+        {
+            try
+            {
+                if (!string.IsNullOrEmpty(keyValue))
+                {
+                    entity.Modify(keyValue);
+                    this.BaseRepository("CollegeMIS").Update(entity);
+                }
+                else
+                {
+                    entity.Create();
+                    this.BaseRepository("CollegeMIS").Insert(entity);
+                }
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj

@@ -1613,6 +1613,10 @@
     <Compile Include="EducationalAdministration\StuCancelLeaveManagement\StuCancelLeaveManagementService.cs" />
     <Compile Include="EducationalAdministration\StuCancelLeaveManagement\StuCancelLeaveManagementBLL.cs" />
     <Compile Include="EducationalAdministration\StuCancelLeaveManagement\StuCancelLeaveManagementIBLL.cs" />
+    <Compile Include="EducationalAdministration\StuDisciplineManagement\StuDisciplineManagementEntity.cs" />
+    <Compile Include="EducationalAdministration\StuDisciplineManagement\StuDisciplineManagementService.cs" />
+    <Compile Include="EducationalAdministration\StuDisciplineManagement\StuDisciplineManagementBLL.cs" />
+    <Compile Include="EducationalAdministration\StuDisciplineManagement\StuDisciplineManagementIBLL.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Learun.Application.Organization\Learun.Application.Organization.csproj">