Merge branch '塔里木分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 塔里木分支

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

@@ -3,21 +3,49 @@
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap">
-    <div class="col-xs-12 lr-form-item"  data-table="EvaCodeOfContuct" >
-        <div class="lr-form-item-title">班级</div>
-        <div id="Class"></div>
+    <div class="col-xs-6 lr-form-item" data-table="EvaCodeOfContuct">
+        <div class="lr-form-item-title">考核人</div>
+        <input id="ClassroomName" type="text" class="form-control" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="EvaCodeOfContuct" >
+    <div class="col-xs-6 lr-form-item" data-table="EvaCodeOfContuct">
+        <div class="lr-form-item-title">宿舍楼<font face="宋体">*</font></div>
+        <div id="FloorId" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="EvaCodeOfContuct">
+        <div class="lr-form-item-title">姓名</div>
+        <input id="StuNo" type="text" class="form-control" style="display:none" />
+        <div id="StuName" isvalid="yes" checkexpession="NotNull"></div>
+        <input id="EDept" type="text" class="form-control" style="display:none" />
+        <input id="EMajor" type="text" class="form-control" style="display:none" />
+        <input id="EClass" type="text" class="form-control" style="display:none" />
+    </div>
+    @*<div class="col-xs-4 lr-form-item" data-table="EvaCodeOfContuct">
+            <div class="lr-form-item-title">院系<font face="宋体">*</font></div>
+            <div id="EDept" isvalid="yes" checkexpession="NotNull"></div>
+        </div>
+        <div class="col-xs-4 lr-form-item" data-table="EvaCodeOfContuct">
+            <div class="lr-form-item-title">专业<font face="宋体">*</font></div>
+            <div id="EMajor" isvalid="yes" checkexpession="NotNull"></div>
+        </div>
+        <div class="col-xs-4 lr-form-item" data-table="EvaCodeOfContuct">
+            <div class="lr-form-item-title">班级<font face="宋体">*</font></div>
+            <div id="EClass" isvalid="yes" checkexpession="NotNull"></div>
+        </div>*@
+    <div class="col-xs-12 lr-form-item" data-table="EvaCodeOfContuct">
+        <div class="lr-form-item-title">违纪行为地点</div>
+        <textarea id="EAddress" class="form-control" style="height: 100px;"></textarea>
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="EvaCodeOfContuct">
         <div class="lr-form-item-title">分数</div>
-        <input id="Fraction" type="text" class="form-control"  />
+        <input id="Fraction" type="text" class="form-control" isvalid="yes" checkexpession="PositiveFloatint" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="EvaCodeOfContuct" >
-        <div class="lr-form-item-title">日期</div>
-        <input id="Data" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#Data').trigger('change'); } })"   />
+    <div class="col-xs-6 lr-form-item" data-table="EvaCodeOfContuct">
+        <div class="lr-form-item-title">日期<font face="宋体">*</font></div>
+        <input id="Data" type="text" class="form-control lr-input-wdatepicker" isvalid="yes" checkexpession="NotNull" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#Data').trigger('change'); } })" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="EvaCodeOfContuct" >
+    <div class="col-xs-12 lr-form-item" data-table="EvaCodeOfContuct">
         <div class="lr-form-item-title">备注</div>
-        <textarea id="Remark" class="form-control" style="height:100px;"  ></textarea>
+        <textarea id="Remark" class="form-control" style="height: 100px;"></textarea>
     </div>
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/EvaCodeOfContuct/Form.js")

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

@@ -15,14 +15,127 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
-            $('#Class').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
+            //$('#EDept').lrselect({
+            //    value: "deptno",
+            //    text: "deptname",
+            //    url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
+            //    select: function (item) {
+            //        if (item) {
+            //            $('#EMajor').lrselectRefresh({
+            //                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable',
+            //                param: { code: "CdMajorInfo", strWhere: "DeptNo='" + item.deptno + "'" }
+            //            });
+            //        }
+            //        else {
+            //            $('#EMajor').lrselectRefresh({
+            //                url: "",
+            //                data: []
+            //            });
+            //        }
+            //        $('#EClass').lrselectRefresh({
+            //            url: "",
+            //            data: []
+            //        });
+            //    }
+            //});
+            //$('#EMajor').lrselect({
+            //    value: "majorno",
+            //    text: "majorname",
+            //    select: function (item) {
+            //        if (item) {
+            //            $('#EClass').lrselectRefresh({
+            //                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable',
+            //                param: { code: "bjsj", strWhere: "DeptNo='" + item.deptno + "' and majorno='" + item.majorno + "'" }
+            //            });
+            //        }
+
+            //    }
+            //});
+            //$('#EMajor').on("click",
+            //    function () {
+            //        var data = $('#EDept').lrselectGet();
+            //        if (!data) {
+            //            learun.alert.error('请先选择系');
+            //        }
+            //    });
+            //$('#EClass').on("click",
+            //    function () {
+            //        var data1 = $('#EDept').lrselectGet();
+            //        var data2 = $('#EMajor').lrselectGet();
+            //        if (!data1 || !data2) {
+            //            learun.alert.error('请先选择系和专业');
+            //        }
+            //    });
+            //$('#EClass').lrselect({
+            //    value: "classno",
+            //    text: "classname"
+            //});
+            $('#FloorId').lrDataSourceSelect({ code: 'Acc_DormitoryData', value: 'id', text: 'name' });
+            $('#StuName').lrGirdSelect({
+                // 字段
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=StuInfoBasic',
+                selectWord: 'stuname',
+                value: 'stuname',
+                text: 'stuname',
+                headData: [
+                    { label: "学号", name: "stuno", width: 100, align: "left" },
+                    { label: "姓名", name: "stuname", width: 100, align: "left" },
+                    {
+                        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: "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: "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']);
+                                }
+                            });
+                        }
+                    }
+
+                ],
+                select: function (item) {
+                    $("#StuName").val(item.stuname);
+                    $("#StuNo").val(item.stuno);
+                    $("#EDept").val(item.deptno);
+                    $("#EMajor").val(item.majorno);
+                    $("#EClass").val(item.classno);
+                }
+            });
         },
         initData: function () {
             if (!!keyValue) {
                 $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/EvaCodeOfContuct/GetFormData?keyValue=' + keyValue, function (data) {
                     for (var id in data) {
                         if (!!data[id].length && data[id].length > 0) {
-                            $('#' + id ).jfGridSet('refreshdata', data[id]);
+                            $('#' + id).jfGridSet('refreshdata', data[id]);
                         }
                         else {
                             $('[data-table="' + id + '"]').lrSetFormData(data[id]);

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

@@ -10,9 +10,29 @@
                     <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="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">系部</div>
+                                    <div id="EDept"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">学号</div>
+                                    <input id="StuNo" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">专业</div>
+                                    <div id="EMajor"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">姓名</div>
+                                    <input id="StuName" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">班级</div>
-                                    <input id="Class" type="text" class="form-control" />
+                                    <div id="EClass"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">考核人</div>
+                                    <input id="CheckPeople" type="text" class="form-control" />
                                 </div>
                             </div>
                         </div>

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

@@ -20,6 +20,63 @@ var bootstrap = function ($, learun) {
             $('#lr_refresh').on('click', function () {
                 location.reload();
             });
+            $('#EDept').lrselect({
+                value: "deptno",
+                text: "deptname",
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo',
+                select: function (item) {
+                    if (item) {
+                        $('#EMajor').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable',
+                            param: { code: "CdMajorInfo", strWhere: "DeptNo='" + item.deptno + "'" }
+                        });
+                    }
+                    else {
+                        $('#EMajor').lrselectRefresh({
+                            url: "",
+                            data: []
+                        });
+                    }
+                    $('#EClass').lrselectRefresh({
+                        url: "",
+                        data: []
+                    });
+                }
+            });
+            $('#EMajor').lrselect({
+                value: "majorno",
+                text: "majorname",
+                select: function (item) {
+                    if (item) {
+                        $('#EClass').lrselectRefresh({
+                            url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable',
+                            param: { code: "bjsj", strWhere: "DeptNo='" + item.deptno + "' and majorno='" + item.majorno + "'" }
+                        });
+                    }
+
+                }
+            });
+
+
+            $('#EMajor').on("click",
+                function () {
+                    var data = $('#EDept').lrselectGet();
+                    if (!data) {
+                        learun.alert.error('请先选择系');
+                    }
+                });
+            $('#EClass').on("click",
+                function () {
+                    var data1 = $('#EDept').lrselectGet();
+                    var data2 = $('#EMajor').lrselectGet();
+                    if (!data1 || !data2) {
+                        learun.alert.error('请先选择系和专业');
+                    }
+                });
+            $('#EClass').lrselect({
+                value: "classno",
+                text: "classname"
+            });
             // 新增
             $('#lr_add').on('click', function () {
                 learun.layerForm({
@@ -27,7 +84,7 @@ var bootstrap = function ($, learun) {
                     title: '新增',
                     url: top.$.rootUrl + '/EducationalAdministration/EvaCodeOfContuct/Form',
                     width: 600,
-                    height: 400,
+                    height: 500,
                     callBack: function (id) {
                         return top[id].acceptClick(refreshGirdData);
                     }
@@ -42,7 +99,7 @@ var bootstrap = function ($, learun) {
                         title: '编辑',
                         url: top.$.rootUrl + '/EducationalAdministration/EvaCodeOfContuct/Form?keyValue=' + keyValue,
                         width: 600,
-                        height: 400,
+                        height: 500,
                         callBack: function (id) {
                             return top[id].acceptClick(refreshGirdData);
                         }
@@ -65,11 +122,37 @@ var bootstrap = function ($, learun) {
         },
         // 初始化列表
         initGird: function () {
-            $('#gridtable').lrAuthorizeJfGrid({
+            $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/EducationalAdministration/EvaCodeOfContuct/GetPageList',
                 headData: [
                     {
-                        label: "班级", name: "Class", width: 100, align: "left",
+                        label: "院系", name: "EDept", 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: "EMajor", 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: "EClass", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
@@ -81,6 +164,36 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
+                    {
+                        label: "班主任", name: "ClassTeach", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'teacheruserdata',
+                                key: value,
+                                keyId: 'f_encode',
+                                callback: function (_data) {
+                                    callback(_data['f_realname']);
+                                }
+                            });
+                        }
+                    },
+                    {
+                        label: "辅导员", name: "CoachTeach", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'teacheruserdata',
+                                key: value,
+                                keyId: 'f_encode',
+                                callback: function (_data) {
+                                    callback(_data['f_realname']);
+                                }
+                            });
+                        }
+                    },
+                    { label: "学号", name: "StuNo", width: 100, align: "left" },
+                    { label: "姓名", name: "StuName", width: 100, align: "left" },
+                    { label: "电话", name: "Mobile", width: 100, align: "left" },
+                    { label: "违纪行为地点", name: "EAddress", width: 200, align: "left" },
                     { label: "分数", name: "Fraction", width: 100, align: "left" },
                     { label: "日期", name: "Data", width: 130, align: "left" },
                     { label: "备注", name: "Remark", width: 100, align: "left" },

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.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic/Form.cshtml

@@ -108,20 +108,52 @@
         <input id="MatherUnit" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">父亲姓名<font face="宋体">*</font></div>
-        <input id="FatherName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <div class="lr-form-item-title">户籍所在地</div>
+        <input id="Domicile" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">父亲电话<font face="宋体">*</font></div>
-        <input id="FatherPhone" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <div class="lr-form-item-title">是否单亲</div>
+        <div id="IsSingle" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">母亲姓名<font face="宋体">*</font></div>
-        <input id="MatherName" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <div class="lr-form-item-title">父亲姓名</div>
+        <input id="FatherName" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">母亲电话<font face="宋体">*</font></div>
-        <input id="MatherPhone" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <div class="lr-form-item-title">母亲姓名</div>
+        <input id="MatherName" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">身份证号</div>
+        <input id="OneIdCardNo" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">身份证号</div>
+        <input id="TwoIdCardNo" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">父亲电话</div>
+        <input id="FatherPhone" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">母亲电话</div>
+        <input id="MatherPhone" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">户籍地址</div>
+        <input id="OneDomicile" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">户籍地址</div>
+        <input id="TwoDomicile" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">现住址</div>
+        <input id="OneAddress" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">现住址</div>
+        <input id="TwoAddress" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">家庭出身</div>
@@ -159,6 +191,10 @@
         <div class="lr-form-item-title">毕业日期</div>
         <input id="GraduateYear" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt: 'yyyy-MM-dd', onpicked: function() { $('#GraduateYear').trigger('change'); } })" />
     </div>
+    <div class="col-xs-6 lr-form-item" data-table="StuInfoBasic">
+        <div class="lr-form-item-title">毕业证书备注</div>
+        <input id="DiplomaRemark" type="text" class="form-control" />
+    </div>
     <div class="col-xs-4 lr-form-item" data-table="StuInfoBasic">
         <div class="lr-form-item-title">系所<font face="宋体">*</font></div>
         <div id="DeptNo" isvalid="yes" checkexpession="NotNull"></div>
@@ -203,9 +239,5 @@
         <div class="lr-form-item-title">备注</div>
         <textarea id="Remark" class="form-control" style="height: 100px;"></textarea>
     </div>
-    <div class="col-xs-12 lr-form-item" data-table="StuInfoBasic">
-        <div class="lr-form-item-title">毕业证书备注</div>
-        <input id="DiplomaRemark" type="text" class="form-control" />
-    </div>
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuInfoBasic/Form.js")

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

@@ -169,7 +169,7 @@ var bootstrap = function ($, learun) {
                         learun.alert.error('请先选择系和专业');
                     }
                 });
-
+            $('#IsSingle').lrDataItemSelect({ code: 'YesOrNoBit' }); 
         },
         initData: function () {
             if (!!keyValue) {

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

@@ -15,5 +15,9 @@
         <div class="lr-form-item-title">回复内容<font face="宋体">*</font></div>
         <textarea id="ReplyContents" class="form-control" style="height:100px;" isvalid="yes" checkexpession="NotNull"></textarea>
     </div>
+    <div class="col-xs-12 lr-form-item" data-table="Sys_ReceiveComplaint">
+        <div class="lr-form-item-title">附件</div>
+        <div id="FilePath" ></div>
+    </div>
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/Sys_ReceiveComplaint/Form.js")

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

@@ -15,13 +15,14 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
+            $('#FilePath').lrUploader();
         },
         initData: function () {
             if (!!keyValue) {
                 $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/Sys_ReceiveComplaint/GetFormData?keyValue=' + keyValue, function (data) {
                     for (var id in data) {
                         if (!!data[id].length && data[id].length > 0) {
-                            $('#' + id ).jfGridSet('refreshdata', data[id]);
+                            $('#' + id).jfGridSet('refreshdata', data[id]);
                         }
                         else {
                             $('[data-table="' + id + '"]').lrSetFormData(data[id]);

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

@@ -15,5 +15,9 @@
         <div class="lr-form-item-title">回复内容<font face="宋体">*</font></div>
         <textarea id="ReplyContents" class="form-control" style="height:100px;" readonly="readonly"></textarea>
     </div>
+    <div class="col-xs-12 lr-form-item" data-table="Sys_ReceiveComplaint">
+        <div class="lr-form-item-title">附件</div>
+        <div id="FilePath"></div>
+    </div>
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/Sys_ReceiveComplaint/FormView.js")

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

@@ -15,6 +15,7 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
+            $('#FilePath').lrUploader();
         },
         initData: function () {
             if (!!keyValue) {

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

@@ -18,5 +18,9 @@
         <div class="lr-form-item-title">投诉意见<font face="宋体">*</font></div>
         <textarea id="Contents" class="form-control" style="height:100px;" isvalid="yes" checkexpession="NotNull"></textarea>
     </div>
+    <div class="col-xs-12 lr-form-item" data-table="Sys_SendComplaint">
+        <div class="lr-form-item-title">附件</div>
+        <div id="FilePath"></div>
+    </div>
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/Sys_SendComplaint/Form.js")

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

@@ -15,6 +15,7 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
+            $('#FilePath').lrUploader();
         },
         initData: function () {
             if (!!keyValue) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendComplaint/FormList.cshtml

@@ -19,5 +19,9 @@
         <div class="lr-form-item-title">接收人<font face="宋体">*</font></div>
         <div id="ReceiverUserId"></div>
     </div>
+    <div class="col-xs-12 lr-form-item" data-table="Sys_SendComplaint">
+        <div class="lr-form-item-title">附件</div>
+        <div id="FilePath"></div>
+    </div>
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/Sys_SendComplaint/FormList.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendComplaint/FormList.js

@@ -15,6 +15,7 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
+            $('#FilePath').lrUploader();
             $('#ReceiverUserId').lrUserSelect({ type: '1' });
         },
         initData: function () {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendComplaint/FormListView.cshtml

@@ -17,7 +17,11 @@
     </div>
     <div class="col-xs-12 lr-form-item" data-table="Sys_SendComplaint">
         <div class="lr-form-item-title">接收人<font face="宋体">*</font></div>
-        <input id="Receiver"  class="form-control" readonly="readonly"/>
+        <input id="Receiver" class="form-control" readonly="readonly" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="Sys_SendComplaint">
+        <div class="lr-form-item-title">附件</div>
+        <div id="FilePath"></div>
     </div>
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/Sys_SendComplaint/FormListView.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_SendComplaint/FormListView.js

@@ -15,6 +15,7 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
+            $('#FilePath').lrUploader();
             $('#ReceiverUserId').lrUserSelect({ type: '1' });
         },
         initData: function () {

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

@@ -12,11 +12,15 @@
     </div>
     <div class="col-xs-12 lr-form-item" data-table="Sys_SendComplaint">
         <div class="lr-form-item-title">主题<font face="宋体">*</font></div>
-        <input id="Title" type="text" class="form-control" readonly="readonly"/>
+        <input id="Title" type="text" class="form-control" readonly="readonly" />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="Sys_SendComplaint">
         <div class="lr-form-item-title">投诉意见<font face="宋体">*</font></div>
         <textarea id="Contents" class="form-control" style="height:100px;" readonly="readonly"></textarea>
     </div>
+    <div class="col-xs-12 lr-form-item" data-table="Sys_SendComplaint">
+        <div class="lr-form-item-title">附件</div>
+        <div id="FilePath"></div>
+    </div>
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/Sys_SendComplaint/FormView.js")

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

@@ -15,6 +15,7 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
+            $('#FilePath').lrUploader();
         },
         initData: function () {
             if (!!keyValue) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherCertificate/Form.cshtml

@@ -21,15 +21,19 @@
     </div>
     <div class="col-xs-12 lr-form-item" data-table="TeacherCertificate">
         <div class="lr-form-item-title">签发机关</div>
-        <input id="TCVisaOffice" type="text" class="form-control"/>
+        <input id="TCVisaOffice" type="text" class="form-control" />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="TeacherCertificate">
         <div class="lr-form-item-title">任教学科</div>
-        <input id="TCClass" type="text" class="form-control"/>
+        <input id="TCClass" type="text" class="form-control" />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="TeacherCertificate">
         <div class="lr-form-item-title">取得时间<font face="宋体">*</font></div>
         <input id="TCTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#TCTime').trigger('change'); } })" isvalid="yes" checkexpession="NotNull" />
     </div>
+    <div class="col-xs-12 lr-form-item" data-table="TeacherCertificate">
+        <div class="lr-form-item-title">附件</div>
+        <div id="FilePath"></div>
+    </div>
 </div>
 @Html.AppendJsFile("/Areas/PersonnelManagement/Views/TeacherCertificate/Form.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/TeacherCertificate/Form.js

@@ -23,13 +23,14 @@ var bootstrap = function ($, learun) {
                 value: "empid",
                 text: "empname"
             });
+            $('#FilePath').lrUploader();
         },
         initData: function () {
             if (!!keyValue) {
                 $.lrSetForm(top.$.rootUrl + '/PersonnelManagement/TeacherCertificate/GetFormData?keyValue=' + keyValue, function (data) {
                     for (var id in data) {
                         if (!!data[id].length && data[id].length > 0) {
-                            $('#' + id ).jfGridSet('refreshdata', data[id]);
+                            $('#' + id).jfGridSet('refreshdata', data[id]);
                         }
                         else {
                             $('[data-table="' + id + '"]').lrSetFormData(data[id]);

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EvaCodeOfContuct/EvaCodeOfContuctEntity.cs

@@ -11,7 +11,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
     /// 日 期：2019-11-20 11:37
     /// 描 述：行为规范日考核
     /// </summary>
-    public class EvaCodeOfContuctEntity 
+    public class EvaCodeOfContuctEntity
     {
         #region  实体成员
         /// <summary>
@@ -22,8 +22,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <summary>
         /// 班级
         /// </summary>
-        [Column("CLASS")]
-        public string Class { get; set; }
+        [Column("ECLASS")]
+        public string EClass { get; set; }
         /// <summary>
         /// 分数
         /// </summary>
@@ -35,6 +35,66 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("DATA")]
         public DateTime? Data { get; set; }
         /// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column("FLOORID")]
+        public string FloorId { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column("StuNo")]
+        public string StuNo { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column("StuName")]
+        public string StuName { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column("EAddress")]
+        public string EAddress { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column("Mobile")]
+        public string Mobile { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column("EDept")]
+        public string EDept { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column("EMajor")]
+        public string EMajor { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column("CheckPeople")]
+        public string CheckPeople { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column("CoachTeach")]
+        public string CoachTeach { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column("ClassTeach")]
+        public string ClassTeach { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column("CreateUser")]
+        public string CreateUser { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column("CREATETIME")]
+        public DateTime? CreateTime { get; set; }
+        /// <summary>
         /// 备注
         /// </summary>
         [Column("REMARK")]

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/EvaCodeOfContuct/EvaCodeOfContuctService.cs

@@ -4,6 +4,7 @@ using Learun.Util;
 using System;
 using System.Collections.Generic;
 using System.Data;
+using System.Linq;
 using System.Text;
 
 namespace Learun.Application.TwoDevelopment.EducationalAdministration
@@ -30,24 +31,44 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             {
                 var strSql = new StringBuilder();
                 strSql.Append("SELECT ");
-                strSql.Append(@"
-                t.ID,
-                t.Class,
-                t.Fraction,
-                t.Data,
-                t.Remark
-                ");
+                strSql.Append(@"*   ");
                 strSql.Append("  FROM EvaCodeOfContuct t ");
                 strSql.Append("  WHERE 1=1 ");
                 var queryParam = queryJson.ToJObject();
                 // 虚拟参数
                 var dp = new DynamicParameters(new { });
+                if (!queryParam["EDept"].IsEmpty())
+                {
+                    dp.Add("EDept", queryParam["EDept"].ToString(), DbType.String);
+                    strSql.Append(" AND t.EDept = @EDept ");
+                }
+                if (!queryParam["EMajor"].IsEmpty())
+                {
+                    dp.Add("EMajor", queryParam["EMajor"].ToString(), DbType.String);
+                    strSql.Append(" AND t.EMajor = @EMajor ");
+                }
                 if (!queryParam["Class"].IsEmpty())
                 {
-                    dp.Add("Class", "%" + queryParam["Class"].ToString() + "%", DbType.String);
-                    strSql.Append(" AND t.Class Like @Class ");
+                    dp.Add("Class", queryParam["Class"].ToString(), DbType.String);
+                    strSql.Append(" AND t.Class = @Class ");
+                }
+                if (!queryParam["StuNo"].IsEmpty())
+                {
+                    dp.Add("StuNo", "%" + queryParam["StuNo"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.StuNo like @StuNo ");
                 }
-                return this.BaseRepository("CollegeMIS").FindList<EvaCodeOfContuctEntity>(strSql.ToString(),dp, pagination);
+                if (!queryParam["StuName"].IsEmpty())
+                {
+                    dp.Add("StuName", "%" + queryParam["StuName"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.StuName like @StuName ");
+                }
+                if (!queryParam["CheckPeople"].IsEmpty())
+                {
+                    dp.Add("CheckPeople", "%" + queryParam["CheckPeople"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.CheckPeople like @CheckPeople ");
+                }
+
+                return this.BaseRepository("CollegeMIS").FindList<EvaCodeOfContuctEntity>(strSql.ToString(), dp, pagination);
             }
             catch (Exception ex)
             {
@@ -99,7 +120,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         {
             try
             {
-                this.BaseRepository("CollegeMIS").Delete<EvaCodeOfContuctEntity>(t=>t.ID == keyValue);
+                this.BaseRepository("CollegeMIS").Delete<EvaCodeOfContuctEntity>(t => t.ID == keyValue);
             }
             catch (Exception ex)
             {
@@ -123,6 +144,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         {
             try
             {
+                var userList = LoginUserInfo.Get();
                 if (!string.IsNullOrEmpty(keyValue))
                 {
                     entity.Modify(keyValue);
@@ -131,6 +153,15 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 else
                 {
                     entity.Create();
+                    entity.Mobile = userList.mobile;
+                    entity.CreateTime = DateTime.Now;
+                    var TeachList = this.BaseRepository("CollegeMIS")
+                        .FindList<ClassInfoEntity>(x => x.ClassNo == entity.EClass).FirstOrDefault();
+                    if (TeachList != null)
+                    {
+                        entity.ClassTeach = TeachList.ClassDiredctorNo;
+                        entity.CoachTeach = TeachList.ClassTutorNo;
+                    }
                     this.BaseRepository("CollegeMIS").Insert(entity);
                 }
             }

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)
             {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs

@@ -723,6 +723,47 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// </summary> 
         [Column("BANKLOCATION")]
         public string BankLocation { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        [Column("ISSINGLE")]
+        public bool? IsSingle { get; set; }
+        /// <summary> 
+        /// 开户银行位置 
+        /// </summary> 
+        [Column("DOMICILE")]
+        public string Domicile { get; set; }
+        /// <summary> 
+        /// 开户银行位置 
+        /// </summary> 
+        [Column("OneDomicile")]
+        public string OneDomicile { get; set; }
+        /// <summary> 
+        /// 开户银行位置 
+        /// </summary> 
+        [Column("TWODOMICILE")]
+        public string TwoDomicile { get; set; }
+        /// <summary> 
+        /// 开户银行位置 
+        /// </summary> 
+        [Column("ONEADDRESS")]
+        public string OneAddress { get; set; }
+        /// <summary> 
+        /// 开户银行位置 
+        /// </summary> 
+        [Column("TWOADDRESS")]
+        public string TwoAddress { get; set; }
+        /// <summary> 
+        /// 村委会书记姓名 
+        /// </summary> 
+        [Column("THREENAME")]
+        public string ThreeName { get; set; }
+        /// <summary> 
+        /// 村委联系方式 
+        /// </summary> 
+        [Column("THREEMOBILE")]
+        public string ThreeMobile { get; set; }
         #endregion
 
         #region  扩展操作

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_ReceiveComplaint/Sys_ReceiveComplaintEntity.cs

@@ -11,7 +11,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
     /// 日 期：2019-04-16 17:19
     /// 描 述：接收投诉意见
     /// </summary>
-    public class Sys_ReceiveComplaintEntity 
+    public class Sys_ReceiveComplaintEntity
     {
         #region  实体成员
         /// <summary>
@@ -79,6 +79,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// </summary>
         [Column("DELFLAG")]
         public bool? DelFlag { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        [Column("FILEPATH")]
+        public string FilePath { get; set; }
         #endregion
 
         #region  扩展操作

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_SendComplaint/Sys_SendComplaintEntity.cs

@@ -11,7 +11,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
     /// 日 期：2019-04-16 17:09
     /// 描 述：发送投诉意见
     /// </summary>
-    public class Sys_SendComplaintEntity 
+    public class Sys_SendComplaintEntity
     {
         #region  实体成员
         /// <summary>
@@ -99,6 +99,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// </summary>
         [Column("REPLYFLAG")]
         public int? ReplyFlag { get; set; }
+
+        /// <summary>
+        /// ReplyFlag
+        /// </summary>
+        [Column("FILEPATH")]
+        public string FilePath { get; set; }
         #endregion
 
         #region  扩展操作
@@ -119,7 +125,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         }
         #endregion
         #region  扩展字段
-        
 
         #endregion
     }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Sys_SendComplaint/Sys_SendComplaintService.cs

@@ -31,22 +31,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             {
                 var strSql = new StringBuilder();
                 strSql.Append("SELECT ");
-                strSql.Append(@"
-                t.SComplaintId,
-                t.ComplaintCode,
-                t.CreateUserId,
-                t.CreateUserName,
-                t.Title,
-                t.Contents,
-                t.CreateTime,
-                t.SendTime,
-                t.SendFlag,
-                t.AssignFlag,
-                t.AssignTime,
-                t.ReceiverId,
-                t.Receiver,
-                t.ReplyFlag
-                ");
+                strSql.Append(@"* ");
                 strSql.Append("  FROM Sys_SendComplaint t ");
                 strSql.Append("  WHERE 1=1 and t.DelFlag=0 ");
                 var queryParam = queryJson.ToJObject();
@@ -235,6 +220,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                         sys_ReceiveComplaintEntity.SendTime = DateTime.Now;
                         sys_ReceiveComplaintEntity.ReplyFlag = 0;
                         sys_ReceiveComplaintEntity.DelFlag = false;
+                        sys_ReceiveComplaintEntity.FilePath = sys_SendComplaintEntity.FilePath;
                         db.Insert(sys_ReceiveComplaintEntity);
                     }
                     //更新发送投诉意见

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/TeacherCertificate/TeacherCertificateEntity.cs

@@ -69,8 +69,11 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         /// </summary>
         [Column("CHECKUSER")]
         public string CheckUser { get; set; }
-
-
+        /// <summary>
+        /// 附件路径
+        /// </summary>
+        [Column("FilePath")]
+        public string FilePath { get; set; }
         #endregion
 
         #region  扩展操作