学生违纪管理-变更需求

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

@@ -3,37 +3,45 @@
     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="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 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="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 id="EmpNo" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-4 lr-form-item" data-table="StuDisciplineManagement">
+        <div class="lr-form-item-title">处分类别<font face="宋体">*</font></div>
+        <div id="SType" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="StuDisciplineManagement" >
+    <div class="col-xs-4 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-4 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'); } })"   />
+        <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="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>
+        <textarea id="Things" class="form-control" style="height:100px;"></textarea>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="StuDisciplineManagement" >
+    <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>
+        <textarea id="StudentAttitude" class="form-control" style="height:100px;"></textarea>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="StuDisciplineManagement" >
+    <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>
+        <textarea id="TeacherOpinion" class="form-control" style="height:100px;"></textarea>
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="StuDisciplineManagement" >
+    <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>
+        <textarea id="ParentsOpinion" 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="SchoolOpinion" 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

@@ -49,7 +49,7 @@ var bootstrap = function ($, learun) {
                 value: "StuNo",
                 text: "StuName"
             });
-            //$('#StuNo').lrDataSourceSelect({ code: 'StuInfoBasic', value: 'stuno', text: 'stuname' });
+            $('#SType').lrDataItemSelect({ code: 'DisType' });
             $('#EmpNo').lrDataSourceSelect({ code: 'EmpInfo', value: 'empno', text: 'empname' });
         },
         initData: function () {

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

@@ -5,19 +5,23 @@
 <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" readonly="readonly"></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" readonly="readonly" isvalid="yes" checkexpession="NotNull" />
+        <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>
-        <div id="EmpNo" isvalid="yes" checkexpession="NotNull" readonly="readonly"></div>
+        <div id="EmpNo" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="StuDisciplineManagement">
+    <div class="col-xs-4 lr-form-item" data-table="StuDisciplineManagement">
+        <div class="lr-form-item-title">违纪类型<font face="宋体">*</font></div>
+        <div id="SType" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-4 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-4 lr-form-item" data-table="StuDisciplineManagement">
         <div class="lr-form-item-title">处理时间</div>
-        <input id="DealTime" type="text" class="form-control lr-input-wdatepicker" readonly="readonly" />
+        <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>
@@ -35,5 +39,9 @@
         <div class="lr-form-item-title">家长意见</div>
         <textarea id="ParentsOpinion" class="form-control" style="height:100px;" readonly="readonly"></textarea>
     </div>
+    <div class="col-xs-12 lr-form-item" data-table="StuDisciplineManagement">
+        <div class="lr-form-item-title">学校意见</div>
+        <textarea id="SchoolOpinion" class="form-control" style="height:100px;"></textarea>
+    </div>
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuDisciplineManagement/FormView.js")

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

@@ -49,7 +49,7 @@ var bootstrap = function ($, learun) {
                 value: "StuNo",
                 text: "StuName"
             });
-            //$('#StuNo').lrDataSourceSelect({ code: 'StuInfoBasic', value: 'stuno', text: 'stuname' });
+            $('#SType').lrDataItemSelect({ code: 'DisType' });
             $('#EmpNo').lrDataSourceSelect({ code: 'EmpInfo', value: 'empno', text: 'empname' });
         },
         initData: function () {

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

@@ -136,9 +136,22 @@ var bootstrap = function ($, learun) {
         },
         // 初始化列表
         initGird: function () {
-            $('#gridtable').lrAuthorizeJfGrid({
+            $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/EducationalAdministration/StuDisciplineManagement/GetPageList',
                 headData: [
+                    { label: "学号", name: "StuNo", width: 100, align: "left" },
+                    {
+                        label: "处分类别", name: "SType", width: 80, align: "left" ,
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'DisType',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
                     {
                         label: "违纪学生", name: "StuNo", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
@@ -152,7 +165,52 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: "违纪时间", name: "DisciplineTime", width: 120, align: "left" },
+                    {
+                        label: "性别", name: "GenderNo", width: 50, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "男" : "女";
+                        }
+                    },
+                    { label: "电话", name: "Mobile", width: 100, align: "left" },
+                    {
+                        label: "院系", name: "DeptNo", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo',
+                                key: value,
+                                keyId: 'deptno',
+                                callback: function (_data) {
+                                    callback(_data['deptname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "专业", name: "majorno", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo',
+                                key: value,
+                                keyId: 'majorno',
+                                callback: function (_data) {
+                                    callback(_data['majorname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "班级", name: "classno", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
+                                key: value,
+                                keyId: 'classno',
+                                callback: function (_data) {
+                                    callback(_data['classname']);
+                                }
+                            });
+                        }
+                    },
                     {
                         label: "处理老师", name: "EmpNo", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
@@ -171,6 +229,7 @@ var bootstrap = function ($, learun) {
                     { label: "学生态度", name: "StudentAttitude", width: 100, align: "left" },
                     { label: "班主任意见", name: "TeacherOpinion", width: 100, align: "left" },
                     { label: "家长意见", name: "ParentsOpinion", width: 100, align: "left" },
+                    { label: "学校意见", name: "SchoolOpinion", width: 100, align: "left" },
                     {
                         label: "审核状态", name: "CheckStatus", width: 100, align: "left", formatter: function (cellvalue) {
                             return cellvalue == "1" ? "<span class=\"label label-warning\">审核中</span>" : cellvalue == "2" ? "<span class=\"label label-success\">审核通过</span>" : cellvalue == "3" ? "<span class=\"label label-danger\">审核未通过</span>" : "<span class=\"label label-default\">草稿</span>";

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

@@ -11,7 +11,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
     /// 日 期：2021-03-26 15:23
     /// 描 述：学生违纪管理
     /// </summary>
-    public class StuDisciplineManagementEntity 
+    public class StuDisciplineManagementEntity
     {
         #region 实体成员
         /// <summary>
@@ -94,6 +94,16 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// </summary>
         [Column("PROCESSID")]
         public string ProcessId { get; set; }
+        /// <summary>
+        /// 学校意见
+        /// </summary>
+        [Column("SCHOOLOPINION")]
+        public string SchoolOpinion { get; set; }
+        /// <summary>
+        /// 类型
+        /// </summary>
+        [Column("STYPE")]
+        public string SType { get; set; }
         #endregion
 
         #region 扩展操作
@@ -114,6 +124,19 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         }
         #endregion
         #region 扩展字段
+        [NotMapped]
+        public bool? GenderNo { get; set; }
+        [NotMapped]
+        public string StuName { get; set; }
+        [NotMapped]
+        public string DeptNo { get; set; }
+        [NotMapped]
+        public string majorno { get; set; }
+        [NotMapped]
+        public string classno { get; set; }
+        [NotMapped]
+        public string Mobile { get; set; }
+
         #endregion
     }
 }

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

@@ -30,23 +30,23 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             try
             {
                 var strSql = new StringBuilder();
-                strSql.Append("SELECT t.* ");
+                strSql.Append(" SELECT t.*,sib.StuName,sib.DeptNo,sib.majorno,sib.classno,sib.GenderNo,sib.Mobile ");
                 strSql.Append("  FROM StuDisciplineManagement t ");
-                strSql.Append("  WHERE 1=1 ");
+                strSql.Append(" left join stuinfobasic sib on t.Stuno = sib.stuno WHERE 1=1 ");
                 var queryParam = queryJson.ToJObject();
                 // 虚拟参数
                 var dp = new DynamicParameters(new { });
                 if (!queryParam["StuNo"].IsEmpty())
                 {
-                    dp.Add("StuNo",queryParam["StuNo"].ToString(), DbType.String);
+                    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);
+                    dp.Add("EmpNo", queryParam["EmpNo"].ToString(), DbType.String);
                     strSql.Append(" AND t.EmpNo = @EmpNo ");
                 }
-                return this.BaseRepository("CollegeMIS").FindList<StuDisciplineManagementEntity>(strSql.ToString(),dp, pagination);
+                return this.BaseRepository("CollegeMIS").FindList<StuDisciplineManagementEntity>(strSql.ToString(), dp, pagination);
             }
             catch (Exception ex)
             {
@@ -94,7 +94,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         {
             try
             {
-                return this.BaseRepository("CollegeMIS").FindEntity<StuDisciplineManagementEntity>(t=>t.ProcessId == processId);
+                return this.BaseRepository("CollegeMIS").FindEntity<StuDisciplineManagementEntity>(t => t.ProcessId == processId);
             }
             catch (Exception ex)
             {
@@ -121,7 +121,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         {
             try
             {
-                this.BaseRepository("CollegeMIS").Delete<StuDisciplineManagementEntity>(t=>t.Id == keyValue);
+                this.BaseRepository("CollegeMIS").Delete<StuDisciplineManagementEntity>(t => t.Id == keyValue);
             }
             catch (Exception ex)
             {