Merge branch '长阳分支中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 长阳分支中职

Learun.Framework.Ultimate V7/Learun.Application.Organization/User/UserBLL.cs

@@ -1111,15 +1111,15 @@ namespace Learun.Application.Organization
                     else
                     {
                         string dbPassword = Md5Helper.Encrypt(DESEncrypt.Encrypt(password.ToLower(), userEntity.F_Secretkey).ToLower(), 32).ToLower();
-                        string phone = Md5Helper.Encrypt(userEntity.F_Mobile, 32).ToLower();
+                        //string phone = Md5Helper.Encrypt(userEntity.F_Mobile, 32).ToLower();
                         if (dbPassword == userEntity.F_Password)
                         {
                             userEntity.LoginOk = true;
                         }
-                        else if (phone == password)
-                        {
-                            userEntity.LoginOk = true;
-                        }
+                        //else if (phone == password)
+                        //{
+                        //    userEntity.LoginOk = true;
+                        //}
                         else
                         {
                             userEntity.LoginMsg = "密码和账户名不匹配!";

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

@@ -116,7 +116,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
 
             var loginUserInfo = LoginUserInfo.Get();
             entity.CreateTime = DateTime.Now;
-            entity.CreateUserId = loginUserInfo.account;
+            entity.CreateUserId = loginUserInfo.userId;
             entity.CheckStatus = 0;
 
             stuInfoBasicChangeIBLL.SaveEntity(keyValue, entity);

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

@@ -38,10 +38,43 @@
                                     <div class="lr-form-item-title">民族</div>
                                     <div id="NationalityNo"></div>
                                 </div>
-                                <div class="col-xs-12 lr-form-item">
+                                <div class="col-xs-6 lr-form-item">
                                     <div class="lr-form-item-title">身份证号</div>
                                     <input id="IdentityCardNo" type="text" class="form-control" />
                                 </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">审核状态</div>
+                                    <div id="CheckMark"></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>
+                                    <input id="StuCode" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">政治面貌</div>
+                                    <div id="PartyFaceNo"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">学制</div>
+                                    <div id="EduSystem"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">身体状态</div>
+                                    <div id="HealthStatus"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">学习形式</div>
+                                    <div id="StudyModality"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">是否有照片</div>
+                                    <div id="Photo"></div>
+                                </div>
+
                             </div>
                         </div>
                     </div>
@@ -62,7 +95,7 @@
                         <a id="checkall" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;审核全部</a>
                         <a id="lr_generate" class="btn btn-default"><i class="fa fa-linode"></i>&nbsp;生成帐号</a>
                         <a id="lr_update" class="btn btn-default"><i class="fa fa-braille"></i>&nbsp;更新帐号</a>
-                        @*<a id="lr_synPhoto" class="btn btn-default"><i class="fa fa-braille"></i>&nbsp;同步照片</a>*@
+                        <a id="lr_synPhoto" class="btn btn-default"><i class="fa fa-braille"></i>&nbsp;同步照片</a>
                         <a id="lr_searchChange" class="btn btn-default"><i class="fa fa-search"></i>&nbsp;查看异动</a>
                         <a id="lr_photo" class="btn btn-default"><i class="fa fa-search"></i>&nbsp;拍照</a>
                         <a id="lr_printInfo" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;学生简历表</a>

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

@@ -10,7 +10,7 @@ var bootstrap = function ($, learun) {
         bind: function () {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
-            }, 300, 400);
+            }, 450, 400);
             $('#DeptNo').lrselect({
                 allowSearch: true,
                 value: "deptno",
@@ -70,6 +70,13 @@ var bootstrap = function ($, learun) {
             $('#GenderNo').lrDataItemSelect({ code: 'usersexbit' });
             $('#NationalityNo').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' });
             $('#FiveYear').lrDataItemSelect({ code: 'PieceCultivateWay' });
+            $('#CheckMark').lrselect({ data: [{ id: '1', text: '已审核' }, { id: '0', text: '未审核' }] });
+            $('#PartyFaceNo').lrDataItemSelect({ code: 'PolityStatus' });
+            $('#EduSystem').lrDataItemSelect({ code: 'EduSystem' });
+            $('#HealthStatus').lrDataItemSelect({ code: 'QRCodeHealthStatus' });
+            $('#StudyModality').lrDataItemSelect({ code: 'StudyModality' });
+            $('#Photo').lrselect({ data: [{ id: '1', text: '是' }, { id: '0', text: '否' }] });
+
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();

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

@@ -29,11 +29,11 @@
     <div class="col-xs-12 text-center">学籍异动前信息</div>
     <div class="col-xs-4 lr-form-item" data-table="StuInfoBasicChange">
         <div class="lr-form-item-title">系部<font face="宋体">*</font></div>
-        <div id="DeptNo"  readonly="readonly"></div>
+        <div id="DeptNo" readonly="readonly"></div>
     </div>
     <div class="col-xs-4 lr-form-item" data-table="StuInfoBasicChange">
         <div class="lr-form-item-title">专业<font face="宋体">*</font></div>
-        <div id="MajorNo"  readonly="readonly"></div>
+        <div id="MajorNo" readonly="readonly"></div>
     </div>
     <div class="col-xs-4 lr-form-item" data-table="StuInfoBasicChange">
         <div class="lr-form-item-title">班级<font face="宋体">*</font></div>
@@ -47,20 +47,20 @@
         </div>
         <div class="col-xs-4 lr-form-item" data-table="StuInfoBasicChange">
             <div class="lr-form-item-title" data-title="新专业">新专业</div>
-            <div id="NewMajorNo" class="contentDiv "></div>
+            <div id="NewMajorNo" class="contentDiv zhuanzhuanye"></div>
         </div>
         <div class="col-xs-4 lr-form-item" data-table="StuInfoBasicChange">
             <div class="lr-form-item-title" data-title="新班级">新班级</div>
             <div id="NewClassNo" class="contentDiv zhuanban"></div>
         </div>
     </div>
-    <div class="col-xs-12 text-center">异动说明</div>
     <div class="NewSchool" style="display:none;">
         <div class="col-xs-12 lr-form-item" data-table="StuInfoBasicChange">
             <div class="lr-form-item-title" data-title="转出学校">转出学校</div>
             <input id="OutSchool" type="text" class="form-control" />
         </div>
     </div>
+    <div class="col-xs-12 text-center">异动说明</div>
     <div class="col-xs-12 lr-form-item" data-table="StuInfoBasicChange">
         <div class="lr-form-item-title">备注</div>
         <textarea id="StuChangeRemark" class="form-control" style="height:50px;"></textarea>

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

@@ -32,37 +32,54 @@ var bootstrap = function ($, learun) {
                         $("#NewMajorNo").siblings('div').html($("#NewMajorNo").siblings('div').attr('data-title') + '<font face="宋体">*</font>');
                         $("#NewClassNo").siblings('div').html($("#NewClassNo").siblings('div').attr('data-title') + '<font face="宋体">*</font>');
                         $(".NewContainer").show();
+                        $('#OutSchool').removeAttr("isvalid");
+                        $('#OutSchool').removeAttr("checkexpession");
+                        $("#OutSchool").siblings('div').html($("#OutSchool").siblings('div').attr('data-title'));
+                        $('#OutSchool').val('');
                         $(".NewSchool").hide();
-                        if (item.id === "01" ) { //留级
-                            $(".NewSchool").hide();
+                        if (item.id === "01" || item.id === "07") { //留级、转班
                             $(".NewContainer").find('.contentDiv.zhuanban').removeAttr('readonly');
                             $("#NewDeptNo").lrselectSet($("#DeptNo").lrselectGet());
-                            $("#NewMajorNo").lrselectSet($("#MajorNo").lrselectGet());
-                            $('#OutSchool').val('');
+                            var timer1 = setInterval(function () {
+                                if ($("#NewDeptNo").lrselectGet()) {
+                                    $("#NewMajorNo").lrselectSet($("#MajorNo").lrselectGet());
+                                    console.log("系部赋值后，在赋值专业：" + $("#NewMajorNo").lrselectGet());
+                                    clearInterval(timer1);
+                                }
+                            }, 1000);
                         } else if (item.id === "02") {//转校
-                            $(".NewSchool").show();
                             $(".NewContainer").find('.contentDiv').removeAttr("isvalid");
                             $(".NewContainer").find('.contentDiv').removeAttr("checkexpession");
                             $(".NewContainer").find('.contentDiv').removeAttr('readonly');
-                            $(".NewSchool").find('.OutSchool').attr("isvalid", 'yes');
-                            $(".NewSchool").find('.OutSchool').attr("checkexpession");
-                            $(".NewSchool").find('.OutSchool').attr('readonly');
                             $("#NewDeptNo").siblings('div').html($("#NewDeptNo").siblings('div').attr('data-title'));
                             $("#NewMajorNo").siblings('div').html($("#NewMajorNo").siblings('div').attr('data-title'));
                             $("#NewClassNo").siblings('div').html($("#NewClassNo").siblings('div').attr('data-title'));
                             $(".NewContainer").hide();
+                            $('#OutSchool').attr("isvalid", 'yes');
+                            $('#OutSchool').attr("checkexpession", "NotNull");
+                            $("#OutSchool").siblings('div').html($("#OutSchool").siblings('div').attr('data-title') + '<font face="宋体">*</font>');
+                            $(".NewSchool").show();
                         } else if (item.id === "03") { //复学
-                            $(".NewSchool").hide();
-                            $(".NewContainer").find('.contentDiv').removeAttr('readonly');
-                            $(".NewSchool").find('.OutSchool').attr("isvalid", "Null");
-                            $('#OutSchool').val('');
-                        } else if (item.id === "04") { //转入
-                            $(".NewSchool").hide();
-                            $(".NewContainer").find('.contentDiv').removeAttr('readonly');
-                            $(".NewSchool").find('.OutSchool').attr("isvalid", "Null");
-                            $('#OutSchool').val('');
+                            $("#NewDeptNo").lrselectSet($("#DeptNo").lrselectGet());
+                            var timer2 = setInterval(function () {
+                                if ($("#NewDeptNo").lrselectGet()) {
+                                    $("#NewMajorNo").lrselectSet($("#MajorNo").lrselectGet());
+                                    console.log("系部赋值后，在赋值专业：" + $("#NewMajorNo").lrselectGet());
+                                    clearInterval(timer2);
+                                }
+                            }, 1000);
+                            var timer3 = setInterval(function () {
+                                if ($("#NewMajorNo").lrselectGet()) {
+                                    $("#NewClassNo").lrselectSet($("#ClassNo").lrselectGet());
+                                    clearInterval(timer3);
+                                }
+                            }, 1000);
+                        } else if (item.id === "04") { //转入/进
+                            learun.alert.warning("异动转进请点击学籍信息管理-异动转入按钮！");
+                            $("#StuNo").val("");
+                            $("#StuName").val("");
                         }
-                        else { //退学、休学、
+                        else if (item.id === "05" || item.id === "06") { //退学、休学、
                             $(".NewContainer").find('.contentDiv').removeAttr("isvalid");
                             $(".NewContainer").find('.contentDiv').removeAttr("checkexpession");
                             $(".NewContainer").find('.contentDiv').removeAttr('readonly');
@@ -70,8 +87,11 @@ var bootstrap = function ($, learun) {
                             $("#NewMajorNo").siblings('div').html($("#NewMajorNo").siblings('div').attr('data-title'));
                             $("#NewClassNo").siblings('div').html($("#NewClassNo").siblings('div').attr('data-title'));
                             $(".NewContainer").hide();
-                            $(".NewSchool").hide();
-                            $('#OutSchool').val('');
+                        }
+                        else if (item.id === "08") { //转专业、
+                            $(".NewContainer").find('.contentDiv.zhuanzhuanye').removeAttr('readonly');
+                            $(".NewContainer").find('.contentDiv.zhuanban').removeAttr('readonly');
+                            $("#NewDeptNo").lrselectSet($("#DeptNo").lrselectGet());
                         }
 
                     }
@@ -83,6 +103,7 @@ var bootstrap = function ($, learun) {
             $('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
             $('#NewDeptNo').lrDataSourceSelect({
                 code: 'CdDeptInfo', value: 'deptno', text: 'deptname', select: function (item) {
+                    //console.log("选择的系部为：" + JSON.stringify(item));
                     if (item != null && item != undefined) {
                         $('#NewMajorNo').lrselectRefresh({
                             url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo',
@@ -98,6 +119,7 @@ var bootstrap = function ($, learun) {
             });
             $('#NewMajorNo').lrDataSourceSelect({
                 code: 'CdMajorInfo', value: 'majorno', text: 'majorname', select: function (item) {
+                    //console.log("选择的专业为：" + JSON.stringify(item));
                     if (item != null && item != undefined) {
                         $('#NewClassNo').lrselectRefresh({
                             url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
@@ -171,29 +193,33 @@ var bootstrap = function ($, learun) {
                             $("#NewMajorNo").siblings('div').html($("#NewMajorNo").siblings('div').attr('data-title') + '<font face="宋体">*</font>');
                             $("#NewClassNo").siblings('div').html($("#NewClassNo").siblings('div').attr('data-title') + '<font face="宋体">*</font>');
                             $(".NewContainer").show();
-                            if (data[id].StuChangeType == "01") { //降级、转班
+                            $('#OutSchool').removeAttr("isvalid");
+                            $('#OutSchool').removeAttr("checkexpession");
+                            $("#OutSchool").siblings('div').html($("#OutSchool").siblings('div').attr('data-title'));
+                            $('#OutSchool').val('');
+                            $(".NewSchool").hide();
+                            if (data[id].StuChangeType == "01" || data[id].StuChangeType == "07") { //留级、转班
                                 $(".NewContainer").find('.contentDiv.zhuanban').removeAttr('readonly');
-                                $(".NewSchool").hide();
-                                $('#OutSchool').val('');
                             }
                             else if (data[id].StuChangeType == "02") {//转校
-                                $(".NewSchool").show();
                                 $(".NewContainer").find('.contentDiv').removeAttr("isvalid");
                                 $(".NewContainer").find('.contentDiv').removeAttr("checkexpession");
                                 $(".NewContainer").find('.contentDiv').removeAttr('readonly');
-                                $(".NewSchool").find('.OutSchool').attr("isvalid");
-                                $(".NewSchool").find('.OutSchool').attr("checkexpession");
-                                $(".NewSchool").find('.OutSchool').attr('readonly');
                                 $("#NewDeptNo").siblings('div').html($("#NewDeptNo").siblings('div').attr('data-title'));
                                 $("#NewMajorNo").siblings('div').html($("#NewMajorNo").siblings('div').attr('data-title'));
                                 $("#NewClassNo").siblings('div').html($("#NewClassNo").siblings('div').attr('data-title'));
                                 $(".NewContainer").hide();
-                            } else if (data[id].StuChangeType == "03") { //转专业
+                                $('#OutSchool').attr("isvalid", 'yes');
+                                $('#OutSchool').attr("checkexpession", "NotNull");
+                                $("#OutSchool").siblings('div').html($("#OutSchool").siblings('div').attr('data-title') + '<font face="宋体">*</font>');
+                                $(".NewSchool").show();
+                            } else if (data[id].StuChangeType == "03") { //复学
                                 $(".NewContainer").find('.contentDiv').removeAttr('readonly');
-                                $(".NewSchool").hide();
-                                $('#OutSchool').val('');
-                            }
-                            else {    //退学、休学、转校
+                            } else if (data[id].StuChangeType == "04") { //转入/进
+                                learun.alert.warning("异动转进请点击学籍信息管理-异动转入按钮！");
+                                $("#StuNo").val("");
+                                $("#StuName").val("");
+                            } else if (data[id].StuChangeType == "05" || data[id].StuChangeType == "06") { //退学、休学、
                                 $(".NewContainer").find('.contentDiv').removeAttr("isvalid");
                                 $(".NewContainer").find('.contentDiv').removeAttr("checkexpession");
                                 $(".NewContainer").find('.contentDiv').removeAttr('readonly');
@@ -201,8 +227,10 @@ var bootstrap = function ($, learun) {
                                 $("#NewMajorNo").siblings('div').html($("#NewMajorNo").siblings('div').attr('data-title'));
                                 $("#NewClassNo").siblings('div').html($("#NewClassNo").siblings('div').attr('data-title'));
                                 $(".NewContainer").hide();
-                                $(".NewSchool").hide();
-                                $('#OutSchool').val('');
+                            }
+                            else if (data[id].StuChangeType == "08") {    //转专业、
+                                $(".NewContainer").find('.contentDiv.zhuanzhuanye').removeAttr('readonly');
+                                $(".NewContainer").find('.contentDiv.zhuanban').removeAttr('readonly');
                             }
                         }
                     }
@@ -212,6 +240,7 @@ var bootstrap = function ($, learun) {
     };
     // 保存数据
     acceptClick = function (callBack) {
+        //console.log($('body').lrGetFormData());
         if (!$('body').lrValidform()) {
             return false;
         }

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

@@ -218,11 +218,11 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
+                    { label: "转出学校", name: "OutSchool", width: 200, align: "left" },
                     { label: "创建时间", name: "CreateTime", width: 130, align: "left" },
                     { label: "创建用户", name: "CreateUserId", width: 100, align: "left" },
                     { label: "审核时间", name: "CheckTime", width: 130, align: "left" },
                     { label: "审核用户", name: "CheckUserId", width: 100, align: "left" },
-                    { label: "转出学校", name: "OutSchool", width: 200, align: "left" },
                     { label: "备注", name: "StuChangeRemark", width: 200, align: "left" },
                     {
                         label: "审核状态", name: "CheckStatus", width: 100, align: "left",

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

@@ -2,6 +2,9 @@
     ViewBag.Title = "学籍信息异动";
     Layout = "~/Views/Shared/_Index.cshtml";
 }
+<script>    
+ var stuId = "@ViewBag.keyValue";
+</script>
 <div class="lr-layout ">
     <div class="lr-layout-center">
         <div class="lr-layout-wrap lr-layout-wrap-notitle ">
@@ -14,16 +17,20 @@
                         <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 class="lr-form-item-title">异动类型</div>
+                                    <div id="StuChangeType"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">修改属性</div>
                                     <input id="FieldName" type="text" class="form-control" />
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">学生主键</div>
-                                    <input id="StuID" value="@ViewBag.keyValue" type="text" class="form-control" />
+                                    <div class="lr-form-item-title">学生姓名</div>
+                                    <div id="StuID"></div>
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">修改人</div>
-                                    <input id="UpdateBy" type="text" class="form-control" />
+                                    <div id="UpdateBy"></div>
                                 </div>
                             </div>
                         </div>

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

@@ -45,6 +45,10 @@ var bootstrap = function ($, learun) {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
             }, 220, 400);
+            $('#StuChangeType').lrDataItemSelect({ code: 'StuChangeType' });
+            $('#StuID').lrDataSourceSelect({ code: 'StuInfoBasic', value: 'stuid', text: 'stuname' });
+            $('#UpdateBy').lrDataSourceSelect({ code: 'BaseUser', value: 'f_account', text: 'f_realname' });
+            
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
@@ -98,9 +102,35 @@ var bootstrap = function ($, learun) {
         },
         // 初始化列表
         initGird: function () {
-            $('#gridtable').lrAuthorizeJfGrid({
+            $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic_ChangeLog/GetPageList',
                 headData: [
+                    {
+                        label: "异动类型", name: "StuChangeType", width: 150, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('dataItem', {
+                                key: value,
+                                code: 'StuChangeType',
+                                callback: function (_data) {
+                                    callback(_data.text);
+                                }
+                            });
+                        }
+                    },
+                    { label: "异动备注", name: "StuChangeRemark", width: 250, align: "left" },
+                    {
+                        label: "学生姓名", name: "StuID", 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: 'stuid',
+                                callback: function (_data) {
+                                    callback(_data['stuname']);
+                                }
+                            });
+                        }
+                    },
                     { label: "修改属性", name: "FieldName", width: 200, align: "left" },
                     { label: "修改前", name: "BeforeChange", width: 200, align: "left" },
                     { label: "修改后", name: "AfterChange", width: 200, align: "left" },
@@ -110,7 +140,7 @@ var bootstrap = function ($, learun) {
                             learun.clientdata.getAsync('custmerData', {
                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser',
                                 key: value,
-                                keyId: 'f_account',
+                                keyId: 'f_userid',
                                 callback: function (_data) {
                                     callback(_data['f_realname']);
                                 }
@@ -119,7 +149,6 @@ var bootstrap = function ($, learun) {
 
                     },
                     { label: "修改时间", name: "UpdateTime", width: 200, align: "left" },
-                    { label: "数据主键", name: "StuID", width: 250, align: "left" },
                 ],
                 mainId: 'ID',
                 isPage: true,
@@ -130,9 +159,18 @@ var bootstrap = function ($, learun) {
         search: function (param) {
 
             param = param || {};
-            if ($("#StuID").val() != "" && $("#StuID").length > 0) {
-                param.StuID = $("#StuID").val();
+
+            //赋值
+            if (stuId != "" && stuId != undefined && stuId != null) {
+                $('#StuID').lrselectSet(stuId);
+                $('#StuID').attr('readonly', 'readonly');
+                $('#StuID').parent().attr('display','none');
+                param.StuID = stuId;
+            } else {
+                $('#StuID').removeAttr('readonly');
+                $('#StuID').parent().attr('display', 'block');
             }
+
             param.StartTime = startTime;
             param.EndTime = endTime;
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/ClassPatrolController.cs

@@ -0,0 +1,127 @@
+using Learun.Util;
+using System.Data;
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Web.Mvc;
+using System.Collections.Generic;
+using System;
+
+namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-08-25 11:16
+    /// 描 述：课堂巡查
+    /// </summary>
+    public class ClassPatrolController : MvcControllerBase
+    {
+        private ClassPatrolIBLL classPatrolIBLL = new ClassPatrolBLL();
+
+        #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 = classPatrolIBLL.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 ClassPatrolData = classPatrolIBLL.GetClassPatrolEntity( keyValue );
+            var jsonData = new {
+                ClassPatrol = ClassPatrolData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region 提交数据
+
+        /// <summary>
+        /// 删除实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult DeleteForm(string keyValue)
+        {
+            classPatrolIBLL.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)
+        {
+            ClassPatrolEntity entity = strEntity.ToObject<ClassPatrolEntity>();
+            var loginUserInfo = LoginUserInfo.Get();
+            if (string.IsNullOrEmpty(keyValue))
+            {
+                entity.CreateUserId = loginUserInfo.userId;
+                entity.CreateTime = DateTime.Now;
+            }
+            else
+            {
+                entity.ModifyUserId = loginUserInfo.userId;
+                entity.ModifyTime = DateTime.Now;
+            }
+            classPatrolIBLL.SaveEntity(keyValue,entity);
+           
+            return Success("保存成功！");
+        }
+        #endregion
+
+    }
+}

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

@@ -0,0 +1,31 @@
+@{
+    ViewBag.Title = "课堂巡查";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item"  data-table="ClassPatrol" >
+        <div class="lr-form-item-title">时间<font face="宋体">*</font></div>
+        <input id="Time" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#Time').trigger('change'); } })"  isvalid="yes" checkexpession="NotNull" />
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="ClassPatrol" >
+        <div class="lr-form-item-title">课节<font face="宋体">*</font></div>
+        <input id="Section" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="ClassPatrol" >
+        <div class="lr-form-item-title">教师<font face="宋体">*</font></div>
+        <div id="EmpNo" isvalid="yes" checkexpession="NotNull" ></div>
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="ClassPatrol" >
+        <div class="lr-form-item-title">科目<font face="宋体">*</font></div>
+        <div id="LessonNo" isvalid="yes" checkexpession="NotNull" ></div>
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="ClassPatrol" >
+        <div class="lr-form-item-title">情况记载</div>
+        <textarea id="Records" class="form-control" style="height:100px;"  ></textarea>
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="ClassPatrol" >
+        <div class="lr-form-item-title">备注</div>
+        <textarea id="Remark" class="form-control" style="height:100px;"  ></textarea>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/PersonnelManagement/Views/ClassPatrol/Form.js")

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

@@ -0,0 +1,52 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2022-08-25 11:16
+ * 描  述：课堂巡查
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            $('#EmpNo').lrDataSourceSelect({ code: 'EmpInfo',value: 'empno',text: 'empname' });
+            $('#LessonNo').lrDataSourceSelect({ code: 'LessonInfo',value: 'lessonno',text: 'lessonname' });
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/PersonnelManagement/ClassPatrol/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]);
+                        }
+                    }
+                });
+            }
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        var postData = {
+            strEntity: JSON.stringify($('body').lrGetFormData())
+        };
+        $.lrSaveForm(top.$.rootUrl + '/PersonnelManagement/ClassPatrol/SaveForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ClassPatrol/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>
+                                    <input id="Section" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">教师</div>
+                                    <div id="EmpNo"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">科目</div>
+                                    <div id="LessonNo"></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>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/PersonnelManagement/Views/ClassPatrol/Index.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/ClassPatrol/Index.js

@@ -0,0 +1,114 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2022-08-25 11:16
+ * 描  述：课堂巡查
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 220, 400);
+            $('#EmpNo').lrDataSourceSelect({ code: 'EmpInfo',value: 'empno',text: 'empname' });
+            $('#LessonNo').lrDataSourceSelect({ code: 'LessonInfo',value: 'lessonno',text: 'lessonname' });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 新增
+            $('#lr_add').on('click', function () {
+                learun.layerForm({
+                    id: 'form',
+                    title: '新增',
+                    url: top.$.rootUrl + '/PersonnelManagement/ClassPatrol/Form',
+                    width: 600,
+                    height: 400,
+                    callBack: function (id) {
+                        return top[id].acceptClick(refreshGirdData);
+                    }
+                });
+            });
+            // 编辑
+            $('#lr_edit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerForm({
+                        id: 'form',
+                        title: '编辑',
+                        url: top.$.rootUrl + '/PersonnelManagement/ClassPatrol/Form?keyValue=' + keyValue,
+                        width: 600,
+                        height: 400,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+            // 删除
+            $('#lr_delete').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    learun.layerConfirm('是否确认删除该项！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/ClassPatrol/DeleteForm', { keyValue: keyValue}, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').lrAuthorizeJfGrid({
+                url: top.$.rootUrl + '/PersonnelManagement/ClassPatrol/GetPageList',
+                headData: [
+                    { label: "时间", name: "Time", width: 100, align: "left"},
+                    { label: "课节", name: "Section", width: 100, 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: "LessonNo", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op,$cell) {
+                             learun.clientdata.getAsync('custmerData', {
+                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'LessonInfo',
+                                 key: value,
+                                 keyId: 'lessonno',
+                                 callback: function (_data) {
+                                     callback(_data['lessonname']);
+                                 }
+                             });
+                        }},
+                    { label: "情况记载", name: "Records", width: 100, align: "left"},
+                    { label: "备注", name: "Remark", width: 100, align: "left"},
+                ],
+                mainId:'Id',
+                isPage: true
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        $('#gridtable').jfGridSet('reload');
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DutySchedule/Index.cshtml

@@ -7,6 +7,15 @@
         <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="datesearch"></div>
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <input id="txt_Keyword" type="text" class="form-control" placeholder="请输入要查询关键字" />
+                    </div>
+                    <div class="lr-layout-tool-item">
+                        <a id="btn_Search" class="btn btn-primary btn-sm"><i class="fa fa-search"></i>&nbsp;查询</a>
+                    </div>
                 </div>
                 <div class="lr-layout-tool-right">
                     <div class=" btn-group btn-group-sm">

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DutySchedule/Index.js

@@ -7,12 +7,46 @@
 var refreshGirdData;
 var bootstrap = function ($, learun) {
     "use strict";
+    var startTime;
+    var endTime;
     var page = {
         init: function () {
             page.initGird();
             page.bind();
         },
         bind: function () {
+            // 时间搜索框
+            $('#datesearch').lrdate({
+                dfdata: [
+                    { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } },
+                    { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }
+                ],
+                // 月
+                mShow: false,
+                premShow: false,
+                // 季度
+                jShow: false,
+                prejShow: false,
+                // 年
+                ysShow: false,
+                yxShow: false,
+                preyShow: false,
+                yShow: false,
+                // 默认
+                dfvalue: '1',
+                selectfn: function (begin, end) {
+                    startTime = begin;
+                    endTime = end;
+                    page.search();
+                }
+            });
+            // 查询
+            $('#btn_Search').on('click', function () {
+                var keyword = $('#txt_Keyword').val();
+                page.search({ keyword: keyword });
+            });
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
@@ -82,11 +116,15 @@ var bootstrap = function ($, learun) {
                 ],
                 mainId: 'ID',
                 isPage: true,
+                sidx: 'createtime',
+                sord: 'desc' 
             });
             page.search();
         },
         search: function (param) {
             param = param || {};
+            param.StartTime = startTime;
+            param.EndTime = endTime;
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

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

@@ -862,6 +862,7 @@
     <Compile Include="Areas\EducationalAdministration\Controllers\StuGraduateConditionController.cs" />
     <Compile Include="Areas\PersonnelManagement\Controllers\TeachManagementController.cs" />
     <Compile Include="Areas\PersonnelManagement\Controllers\EvaluateTeachLearnController.cs" />
+    <Compile Include="Areas\PersonnelManagement\Controllers\ClassPatrolController.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Areas\AdmissionsPlatform\Views\AP_OnlineUserInfo\DropOutIndex.js" />
@@ -6850,6 +6851,10 @@
     <Content Include="Areas\PersonnelManagement\Views\EvaluateTeachLearn\Index.js" />
     <Content Include="Areas\PersonnelManagement\Views\EvaluateTeachLearn\Form.cshtml" />
     <Content Include="Areas\PersonnelManagement\Views\EvaluateTeachLearn\Form.js" />
+    <Content Include="Areas\PersonnelManagement\Views\ClassPatrol\Index.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\ClassPatrol\Index.js" />
+    <Content Include="Areas\PersonnelManagement\Views\ClassPatrol\Form.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\ClassPatrol\Form.js" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Areas\EducationalAdministration\Views\OpenLessonPlanOfElectivePre\" />

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/Default.cshtml

@@ -89,7 +89,7 @@
                         <img class="inp_icon" src="~/Content/images/Login/default_account0.png" alt=""> <input id="lr_username" type="text" placeholder="身份证号">
                     </div>
                     <div class="lr-login-input">
-                        <img class="inp_icon" src="~/Content/images/Login/default_psw0.png" alt=""><input id="lr_password" type="password" placeholder="手机号">
+                        <img class="inp_icon" src="~/Content/images/Login/default_psw0.png" alt=""><input id="lr_password" type="password" placeholder="密码">
                         <span id="psw_change"></span>
                     </div>
                     <div class="lr-login-input lr-login-reg">

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/NewsApi.cs

@@ -9,6 +9,7 @@ using System.Text;
 using System.Data;
 using Learun.Application.OA;
 using Learun.Application.Organization;
+using System;
 
 namespace Learun.Application.WebApi.Modules
 {
@@ -18,12 +19,15 @@ namespace Learun.Application.WebApi.Modules
         private NoticeIBLL noticeIBLL = new NoticeBLL();
         private DepartmentIBLL departmentIBLL = new DepartmentBLL();
         private PostIBLL postIBLL = new PostBLL();
+        private LR_OA_NewsReadIBLL lR_OA_NewsReadIBLL = new LR_OA_NewsReadBLL();
 
         public NewsApi()
         : base("/learun/news")
         {
             Get["/list"] = GetList;
             Get["/shList"] = GetshList;
+
+            Post["/newsRead"] = NewsRead;
         }
 
 
@@ -135,13 +139,46 @@ namespace Learun.Application.WebApi.Modules
                 F_SendPostId.Trim(',');
                 shlist.F_SendPostId = F_SendPostId;
             }
+            if (!shlist.F_NewsContent.IsEmpty())
+            {
+                shlist.F_NewsContent = WebHelper.HtmlDecode(shlist.F_NewsContent);
+            }
             return Success(shlist);
         }
-        #region 私有类
 
+        /// <summary>
+        /// 阅读通知公告
+        /// <summary>
+        /// <returns></returns>
+        public Response NewsRead(dynamic _)
+        {
+            var loginUserInfo = LoginUserInfo.Get();
+            NoticeEntity parameter = this.GetReqData<NoticeEntity>();
+
+            //判断当前用户是否阅读当前通知公告
+            var entity = lR_OA_NewsReadIBLL.GetLR_OA_NewsReadEntityByNewsIdAndUserId(parameter.newsId, loginUserInfo.userId);
+            if (entity == null)
+            {
+                var lR_OA_NewsRead = new LR_OA_NewsReadEntity()
+                {
+                    NewsId = parameter.newsId,
+                    RUserId = loginUserInfo.userId,
+                    RUserName = loginUserInfo.realName,
+                    RTime = DateTime.Now
+                };
+                lR_OA_NewsReadIBLL.SaveEntity("", lR_OA_NewsRead);
+
+                //修改当前通知公告的浏览量
+                lR_OA_NewsReadIBLL.UpdateNewsPV(parameter.newsId);
+            }
+
+            return Success("阅读成功！");
+        }
+        #region 私有类
         private class NoticeEntity
         {
             public string ProgressId { get; set; }
+            public string newsId { get; set; }
         }
         #endregion
 

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/PersonnelManagement/DutyScheduleApi.cs

@@ -1,4 +1,5 @@
-using Nancy;
+using System;
+using Nancy;
 using Learun.Util;
 using System.Collections.Generic;
 using Learun.Application.TwoDevelopment.EducationalAdministration;
@@ -21,9 +22,13 @@ namespace Learun.Application.WebApi.Modules
         /// 注册接口 
         /// <summary> 
         public DutyScheduleApi()
-            : base("/Learun/adms/PersonnelManagement/DutySchedule")
+            : base("/learun/adms/PersonnelManagement/DutySchedule")
         {
             Get["/pagelist"] = GetPageList;
+            Get["/list"] = GetList;
+            Get["/form"] = GetForm;
+            Post["/save"] = SaveForm;
+            Post["/delete"] = DeleteForm;
         }
         #region  获取数据 
 
@@ -45,6 +50,74 @@ namespace Learun.Application.WebApi.Modules
             };
             return Success(jsonData);
         }
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// <summary>
+        /// <param name="_"></param>
+        /// <returns></returns>
+        public Response GetList(dynamic _)
+        {
+            string queryJson = this.GetReqData();
+            var data = dutyScheduleIBLL.GetList();
+            return Success(data);
+        }
+        /// <summary>
+        /// 获取表单数据
+        /// <summary>
+        /// <param name="_"></param>
+        /// <returns></returns>
+        public Response GetForm(dynamic _)
+        {
+            string keyValue = this.GetReqData();
+            var ScheduleData = dutyScheduleIBLL.GetDutyScheduleEntity(keyValue);
+            //ScheduleData.StartTime = Convert.ToDateTime((ScheduleData.StartTime.ToDate().ToString("yyyy-MM-dd") + " " + ScheduleData.StartTime.Substring(0, 2) + ":" + ScheduleData.StartTime.Substring(2, 2)).ToDate().ToString("yyyy-MM-dd HH:mm"));
+            //ScheduleData.EndTime = Convert.ToDateTime((ScheduleData.EndTime.ToDate().ToString("yyyy-MM-dd") + " " + ScheduleData.EndTime.Substring(0, 2) + ":" + ScheduleData.F_EndTime.Substring(2, 2)).ToDate().ToString("yyyy-MM-dd HH:mm"));
+            var jsonData = new
+            {
+                Schedule = ScheduleData,
+            };
+            return Success(jsonData);
+        }
+        #endregion
+
+        #region 提交数据
+        /// <summary>
+        /// 保存实体数据（新增、修改）
+        /// <param name="_"></param>
+        /// <summary>
+        /// <returns></returns>
+        public Response SaveForm(dynamic _)
+        {
+            ReqFormEntity parameter = this.GetReqData<ReqFormEntity>();
+            DutyScheduleEntity entity = parameter.strEntity.ToObject<DutyScheduleEntity>();
+            dutyScheduleIBLL.SaveEntity(parameter.keyValue, entity);
+            return Success("保存成功！");
+        }
+
+
+        /// <summary>
+        /// 删除实体数据
+        /// <param name="_"></param>
+        /// <summary>
+        /// <returns></returns>
+        public Response DeleteForm(dynamic _)
+        {
+            string keyValue = this.GetReqData();
+            dutyScheduleIBLL.DeleteEntity(keyValue);
+            return Success("删除成功！");
+        }
+        #endregion
+
+        #region 私有类
+        /// <summary>
+        /// 表单实体类
+        /// <summary>
+        private class ReqFormEntity
+        {
+            public string keyValue { get; set; }
+            public string strEntity { get; set; }
+        }
         #endregion
     }
 }

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/SYS_ReceiveMessageApi.cs

@@ -70,6 +70,10 @@ namespace Learun.Application.WebApi
         {
             string keyValue = this.GetReqData();
             var SYS_ReceiveMessageData = sYS_ReceiveMessageIBLL.GetUrlSYS_ReceiveMessageEntity(keyValue);
+            if (SYS_ReceiveMessageData != null)
+            {
+                SYS_ReceiveMessageData.CONTENTS = WebHelper.HtmlDecode(SYS_ReceiveMessageData.CONTENTS);
+            }
             var jsonData = new
             {
                 SYS_ReceiveMessage = SYS_ReceiveMessageData,

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/Sys_ReceiveFileApi.cs

@@ -77,7 +77,7 @@ namespace Learun.Application.WebApi
                     result = "/" + result.Substring(result.IndexOf("Resource"));
                 }
                 Sys_ReceiveFileData.Url = result;
-
+                Sys_ReceiveFileData.Contents = WebHelper.HtmlDecode(Sys_ReceiveFileData.Contents);
             }
             var jsonData = new
             {

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

@@ -619,6 +619,7 @@
     <Compile Include="EducationalAdministration\StuGraduateConditionMap.cs" />
     <Compile Include="PersonnelManagement\TeachManagementMap.cs" />
     <Compile Include="PersonnelManagement\EvaluateTeachLearnMap.cs" />
+    <Compile Include="PersonnelManagement\ClassPatrolMap.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Learun.Application.Organization\Learun.Application.Organization.csproj">

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/PersonnelManagement/ClassPatrolMap.cs

@@ -0,0 +1,29 @@
+using Learun.Application.TwoDevelopment.PersonnelManagement;
+using System.Data.Entity.ModelConfiguration;
+
+namespace  Learun.Application.Mapping
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-08-25 11:16
+    /// 描 述：课堂巡查
+    /// </summary>
+    public class ClassPatrolMap : EntityTypeConfiguration<ClassPatrolEntity>
+    {
+        public ClassPatrolMap()
+        {
+            #region 表、主键
+            //表
+            this.ToTable("CLASSPATROL");
+            //主键
+            this.HasKey(t => t.Id);
+            #endregion
+
+            #region 配置关系
+            #endregion
+        }
+    }
+}
+

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

@@ -464,7 +464,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("STUDYMODALITY")]
         public string StudyModality { get; set; }
         /// <summary>
-        /// 学籍异动状态
+        /// 学籍异动状态（1表示不显示成绩）
         /// </summary>
         /// <returns></returns>
         [Column("CHANGESTATUS")]

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

@@ -103,6 +103,57 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     dp.Add("Remark", "%" + queryParam["Remark"].ToString() + "%", DbType.String);
                     strSql.Append(" AND t.Remark Like @Remark ");
                 }
+
+                if (!queryParam["CheckMark"].IsEmpty())
+                {
+                    dp.Add("CheckMark", "" + queryParam["CheckMark"].ToString() + "", DbType.String);
+                    if (queryParam["CheckMark"].ToString() == "1")
+                    {
+                        strSql.Append(" AND t.CheckMark=@CheckMark ");
+                    }
+                    else
+                    {
+                        strSql.Append(" AND (t.CheckMark is null or t.CheckMark='0') ");
+                    }
+                }
+                if (!queryParam["StuCode"].IsEmpty())
+                {
+                    dp.Add("StuCode", "%" + queryParam["StuCode"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.StuCode Like @StuCode ");
+                }
+                if (!queryParam["PartyFaceNo"].IsEmpty())
+                {
+                    dp.Add("PartyFaceNo", "" + queryParam["PartyFaceNo"].ToString() + "", DbType.String);
+                    strSql.Append(" AND t.PartyFaceNo = @PartyFaceNo ");
+                }
+                if (!queryParam["EduSystem"].IsEmpty())
+                {
+                    dp.Add("EduSystem", "" + queryParam["EduSystem"].ToString() + "", DbType.String);
+                    strSql.Append(" AND t.EduSystem = @EduSystem ");
+                }
+                if (!queryParam["HealthStatus"].IsEmpty())
+                {
+                    dp.Add("HealthStatus", "" + queryParam["HealthStatus"].ToString() + "", DbType.String);
+                    strSql.Append(" AND t.HealthStatus = @HealthStatus ");
+                }
+                if (!queryParam["StudyModality"].IsEmpty())
+                {
+                    dp.Add("StudyModality", "" + queryParam["StudyModality"].ToString() + "", DbType.String);
+                    strSql.Append(" AND t.StudyModality = @StudyModality ");
+                }
+
+                if (!queryParam["Photo"].IsEmpty())
+                {
+                    dp.Add("Photo", "" + queryParam["Photo"].ToString() + "", DbType.String);
+                    if (queryParam["Photo"].ToString() == "1")
+                    {
+                        strSql.Append(" AND t.Photo is not null ");
+                    }
+                    else
+                    {
+                        strSql.Append(" AND t.Photo is null  ");
+                    }
+                }
                 return this.BaseRepository("CollegeMIS").FindList<StuInfoBasicEntity>(strSql.ToString(), dp, pagination);
             }
             catch (Exception ex)
@@ -447,13 +498,38 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 var url = AppDomain.CurrentDomain.BaseDirectory;
                 foreach (var stuInfo in stuList)
                 {
-                    //照片不为空
-                    if (!string.IsNullOrEmpty(stuInfo.Photo))
+                    //判断要上传的照片在本地服务器中是否存在
+                    var photoPath = $"{url}/Resource/UserPhoto/{stuInfo.IdentityCardNo}.jpg";
+                    if (System.IO.File.Exists(photoPath))
                     {
-                        var annex = this.BaseRepository()
-                            .FindEntity<AnnexesFileEntity>(a => a.F_FolderId == stuInfo.Photo);
-                        if (annex == null)
+                        //学籍表中照片字段不为空
+                        if (!string.IsNullOrEmpty(stuInfo.Photo))
                         {
+                            var annex = this.BaseRepository()
+                                .FindEntity<AnnexesFileEntity>(a => a.F_FolderId == stuInfo.Photo);
+                            if (annex == null)
+                            {
+                                var annexEntity = new AnnexesFileEntity()
+                                {
+                                    F_Id = Guid.NewGuid().ToString(),
+                                    F_FileName = stuInfo.IdentityCardNo + ".jpg",
+                                    F_FilePath = $"{url}/Resource/UserPhoto/{stuInfo.IdentityCardNo}.jpg",
+                                    F_FolderId = stuInfo.Photo
+                                };
+                                this.BaseRepository().Insert(annexEntity);
+
+                            }
+                            else
+                            {
+                                annex.F_FileName = stuInfo.IdentityCardNo + ".jpg";
+                                annex.F_FilePath = $"{url}/Resource/UserPhoto/{stuInfo.IdentityCardNo}.jpg";
+                                this.BaseRepository().Update(annex);
+                            }
+                        }
+                        else
+                        {
+                            stuInfo.Photo = Guid.NewGuid().ToString();
+
                             var annexEntity = new AnnexesFileEntity()
                             {
                                 F_Id = Guid.NewGuid().ToString(),
@@ -461,32 +537,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                                 F_FilePath = $"{url}/Resource/UserPhoto/{stuInfo.IdentityCardNo}.jpg",
                                 F_FolderId = stuInfo.Photo
                             };
+                            annexEntity.Create();
+                            this.BaseRepository("CollegeMIS").Update(stuInfo);
                             this.BaseRepository().Insert(annexEntity);
-
-                        }
-                        else
-                        {
-                            annex.F_FileName = stuInfo.IdentityCardNo + ".jpg";
-                            annex.F_FilePath = $"{url}/Resource/UserPhoto/{stuInfo.IdentityCardNo}.jpg";
-                            this.BaseRepository().Update(annex);
                         }
                     }
-                    else
-                    {
-                        stuInfo.Photo = Guid.NewGuid().ToString();
-
-                        var annexEntity = new AnnexesFileEntity()
-                        {
-                            F_Id = Guid.NewGuid().ToString(),
-                            F_FileName = stuInfo.IdentityCardNo + ".jpg",
-                            F_FilePath = $"{url}/Resource/UserPhoto/{stuInfo.IdentityCardNo}.jpg",
-                            F_FolderId = stuInfo.Photo
-                        };
-                        annexEntity.Create();
-                        this.BaseRepository("CollegeMIS").Update(stuInfo);
-                        this.BaseRepository().Insert(annexEntity);
-                    }
-
+                    
                 }
             }
             catch (Exception ex)
@@ -1008,16 +1064,17 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// <returns></returns>
         public void SaveEntity(string keyValue, StuInfoBasicEntity entity)
         {
+            var db = this.BaseRepository("CollegeMIS").BeginTrans();
             try
             {
                 UserIBLL userIBLL = new UserBLL();
+                var loginUser = LoginUserInfo.Get();
                 if (!string.IsNullOrEmpty(keyValue))
                 {
                     entity.Modify(keyValue);
 
                     var oldEntity = this.BaseRepository("CollegeMIS").FindEntity<StuInfoBasicEntity>(keyValue);
                     List<StuInfoBasic_ChangeLogEntity> list = new List<StuInfoBasic_ChangeLogEntity>();
-                    var loginUser = LoginUserInfo.Get();
                     var tableInfos = this.BaseRepository("CollegeMIS").FindTable(@"SELECT t.[name] AS 表名,c.[name] AS 字段名,cast(ep.[value] 
   as varchar(100)) AS [字段说明]
   FROM sys.tables AS t
@@ -1055,7 +1112,9 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                                 AfterChange = newValue.ToString(),
                                 FieldName = columnName,
                                 UpdateBy = loginUser.userId,
-                                UpdateTime = DateTime.Now
+                                UpdateTime = DateTime.Now,
+                                StuChangeType="09",
+                                StuChangeRemark="点击学籍信息管理-修改按钮进行操作"
                             };
                             changeEntity.Create();
                             list.Add(changeEntity);
@@ -1065,7 +1124,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
 
                     if (list.Count > 0)
                     {
-                        this.BaseRepository("CollegeMIS").Insert(list);
+                        db.Insert(list);
                     }
 
 
@@ -1086,37 +1145,55 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                         userIBLL.SaveEntity(baseUser.F_UserId, baseUser);
                     }
 
-                    this.BaseRepository("CollegeMIS").Update(entity);
+                    db.Update(entity);
                 }
                 else
                 {
                     entity.Create();
-                    if (entity.IsTran == "0")
+                    if (entity.IsTran == "0")//转入/进
                     {
-                        StuInfoBasicChangeEntity stuinfoChange = new StuInfoBasicChangeEntity
+                        //学籍异动表
+                        //StuInfoBasicChangeEntity stuinfoChange = new StuInfoBasicChangeEntity
+                        //{
+                        //    Id = Guid.NewGuid().ToString(),
+                        //    StuNo = entity.StuNo,
+                        //    StuName = entity.StuName,
+                        //    DeptNo = entity.DeptNo,
+                        //    MajorNo = entity.MajorNo,
+                        //    ClassNo = entity.ClassNo,
+                        //    StuChangeRemark = entity.Remark,
+                        //    NewDeptNo = entity.DeptNo,
+                        //    NewMajorNo = entity.MajorNo,
+                        //    NewClassNo = entity.ClassNo,
+                        //    CreateUserId = entity.StuNo,
+                        //    StuChangeType = "04",
+                        //    StuChangeReason = "10",
+                        //    CreateTime = DateTime.Now,
+                        //};
+                        //db.Insert(stuinfoChange);
+                        //学籍异动日志表
+                        var changeEntity = new StuInfoBasic_ChangeLogEntity
                         {
-                            Id = Guid.NewGuid().ToString(),
-                            StuNo = entity.StuNo,
-                            StuName = entity.StuName,
-                            DeptNo = entity.DeptNo,
-                            MajorNo = entity.MajorNo,
-                            ClassNo = entity.ClassNo,
-                            StuChangeRemark = entity.Remark,
-                            NewDeptNo = entity.DeptNo,
-                            NewMajorNo = entity.MajorNo,
-                            NewClassNo = entity.ClassNo,
-                            CreateUserId = entity.StuNo,
+                            StuID = entity.StuId,
+                            BeforeChange = "",
+                            AfterChange = "",
+                            FieldName = "",
+                            UpdateBy = loginUser.userId,
+                            UpdateTime = DateTime.Now,
                             StuChangeType = "04",
-                            StuChangeReason = "10",
-                            CreateTime = DateTime.Now,
+                            StuChangeRemark = "点击学籍信息管理-异动转入按钮进行操作"
                         };
-                        this.BaseRepository("CollegeMIS").Insert(stuinfoChange);
+                        changeEntity.Create();
+                        db.Insert(changeEntity);
                     }
-                    this.BaseRepository("CollegeMIS").Insert(entity);
+                    db.Insert(entity);
                 }
+
+                db.Commit();
             }
             catch (Exception ex)
             {
+                db.Rollback();
                 if (ex is ExceptionEx)
                 {
                     throw;

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeEntity.cs

@@ -45,17 +45,17 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         [Column("CLASSNO")]
         public string ClassNo { get; set; }
         /// <summary>
-        /// StuChangeType
+        /// 异动类型（留级01，转出/校02，复学03，转入/进04，退学05，休学06，转班07，转专业08，学籍关键信息更改09）
         /// </summary>
         [Column("STUCHANGETYPE")]
         public string StuChangeType { get; set; }
         /// <summary>
-        /// StuChangeReason
+        /// 异动原因
         /// </summary>
         [Column("STUCHANGEREASON")]
         public string StuChangeReason { get; set; }
         /// <summary>
-        /// StuChangeRemark
+        /// 异动备注
         /// </summary>
         [Column("STUCHANGEREMARK")]
         public string StuChangeRemark { get; set; }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeService.cs

@@ -149,30 +149,215 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             var db = this.BaseRepository("CollegeMIS").BeginTrans();
             try
             {
+                var loginUserInfo = LoginUserInfo.Get();
+                var now = DateTime.Now;
+                var logList = new List<StuInfoBasic_ChangeLogEntity>();
                 var entity = db.FindEntity<StuInfoBasicChangeEntity>(x => x.Id == keyValue);
                 if (entity != null)
                 {
-                    //处理数据
-                    if (entity.StuChangeType == "01" || entity.StuChangeType == "03")   //降级、转班、转专业
+                    var stuInfoBasicEntity = db.FindEntity<StuInfoBasicEntity>(x => x.StuNo == entity.StuNo);
+                    if (stuInfoBasicEntity != null)
                     {
-                        //改信息；
-                        var classInfoEntity = db.FindEntity<ClassInfoEntity>(x => x.ClassNo == entity.NewClassNo);
-                        if (classInfoEntity != null)
+                        //处理数据
+                        if (entity.StuChangeType == "01" || entity.StuChangeType == "07")   //降级、转班、
                         {
-                            db.ExecuteBySql($"update StuInfoBasic set DeptNo='{entity.NewDeptNo}',MajorNo='{entity.NewMajorNo}',ClassNo='{entity.NewClassNo}',Grade='{classInfoEntity.Grade}' where StuNo='{entity.StuNo}' ");
+                            if (stuInfoBasicEntity.ClassNo != entity.NewClassNo)
+                            {
+                                var classInfoEntity = db.FindEntity<ClassInfoEntity>(x => x.ClassNo == entity.NewClassNo);
+                                if (classInfoEntity != null)
+                                {
+                                    if (stuInfoBasicEntity.Grade != classInfoEntity.Grade)
+                                    {
+                                        //增加异动日志表：年级
+                                        var logentity2 = new StuInfoBasic_ChangeLogEntity()
+                                        {
+                                            FieldName = "年级",
+                                            BeforeChange = stuInfoBasicEntity.Grade,
+                                            AfterChange = classInfoEntity.Grade,
+                                            UpdateBy = loginUserInfo.userId,
+                                            UpdateTime = now,
+                                            StuID = stuInfoBasicEntity.StuId,
+                                            StuChangeType = entity.StuChangeType,
+                                            StuChangeRemark = entity.StuChangeRemark,
+                                            StuChangeId = entity.Id
+                                        };
+                                        logentity2.Create();
+                                        logList.Add(logentity2);
+                                    }
+                                    //改学籍信息表；
+                                    db.ExecuteBySql($"update StuInfoBasic set ClassNo='{entity.NewClassNo}',Grade='{classInfoEntity.Grade}' where StuNo='{entity.StuNo}' ");
+                                    //增加异动日志表：班级
+                                    var logentity = new StuInfoBasic_ChangeLogEntity()
+                                    {
+                                        FieldName = "班级",
+                                        BeforeChange = entity.ClassNo,
+                                        AfterChange = entity.NewClassNo,
+                                        UpdateBy = loginUserInfo.userId,
+                                        UpdateTime = now,
+                                        StuID = stuInfoBasicEntity.StuId,
+                                        StuChangeType = entity.StuChangeType,
+                                        StuChangeRemark = entity.StuChangeRemark,
+                                        StuChangeId = entity.Id
+                                    };
+                                    logentity.Create();
+                                    logList.Add(logentity);
+                                }
+                            }
+
                         }
-                    }
-                    else if (entity.StuChangeType == "02" || entity.StuChangeType == "04")  //退学、休学
-                    {
-                        //改信息；不显示成绩；
-                        db.ExecuteBySql($"update StuInfoBasic set ChangeStatus=1 where StuNo='{entity.StuNo}' ");
-                    }
+                        else if (entity.StuChangeType == "02" || entity.StuChangeType == "05" || entity.StuChangeType == "06")  //转校、退学、休学、
+                        {
+                            //增加异动日志表：学籍异动状态
+                            var logentity = new StuInfoBasic_ChangeLogEntity()
+                            {
+                                FieldName = "学籍异动状态",
+                                BeforeChange = stuInfoBasicEntity.ChangeStatus?.ToString(),
+                                AfterChange = "1",
+                                UpdateBy = loginUserInfo.userId,
+                                UpdateTime = now,
+                                StuID = stuInfoBasicEntity.StuId,
+                                StuChangeType = entity.StuChangeType,
+                                StuChangeRemark = entity.StuChangeRemark,
+                                StuChangeId = entity.Id
+                            };
+                            logentity.Create();
+                            logList.Add(logentity);
+                            //改学籍信息（异动状态为1表示不显示成绩）；
+                            db.ExecuteBySql($"update StuInfoBasic set ChangeStatus=1 where StuNo='{entity.StuNo}' ");
+                        }
+                        else if (entity.StuChangeType == "03")  //复学
+                        {
+                            //增加异动日志表：学籍异动状态
+                            var logentity = new StuInfoBasic_ChangeLogEntity()
+                            {
+                                FieldName = "学籍异动状态",
+                                BeforeChange = stuInfoBasicEntity.ChangeStatus?.ToString(),
+                                AfterChange = "0",
+                                UpdateBy = loginUserInfo.userId,
+                                UpdateTime = now,
+                                StuID = stuInfoBasicEntity.StuId,
+                                StuChangeType = entity.StuChangeType,
+                                StuChangeRemark = entity.StuChangeRemark,
+                                StuChangeId = entity.Id
+                            };
+                            logentity.Create();
+                            logList.Add(logentity);
+                            //改学籍信息（异动状态为0表示显示成绩）；
+                            db.ExecuteBySql($"update StuInfoBasic set ChangeStatus=null where StuNo='{entity.StuNo}' ");
+                        }
+                        else if (entity.StuChangeType == "08")   //转专业、
+                        {
+                            if (stuInfoBasicEntity.MajorNo != entity.NewMajorNo)
+                            {
+                                var classInfoEntity2 = db.FindEntity<ClassInfoEntity>(x => x.ClassNo == entity.NewClassNo);
+                                if (classInfoEntity2 != null)
+                                {
+                                    if (stuInfoBasicEntity.Grade != classInfoEntity2.Grade)
+                                    {
+                                        //增加异动日志表：年级
+                                        var logentity3 = new StuInfoBasic_ChangeLogEntity()
+                                        {
+                                            FieldName = "年级",
+                                            BeforeChange = stuInfoBasicEntity.Grade,
+                                            AfterChange = classInfoEntity2.Grade,
+                                            UpdateBy = loginUserInfo.userId,
+                                            UpdateTime = now,
+                                            StuID = stuInfoBasicEntity.StuId,
+                                            StuChangeType = entity.StuChangeType,
+                                            StuChangeRemark = entity.StuChangeRemark,
+                                            StuChangeId = entity.Id
+                                        };
+                                        logentity3.Create();
+                                        logList.Add(logentity3);
+                                    }
+                                    //改学籍信息；
+                                    db.ExecuteBySql($"update StuInfoBasic set MajorNo='{entity.NewMajorNo}',ClassNo='{entity.NewClassNo}',Grade='{classInfoEntity2.Grade}' where StuNo='{entity.StuNo}' ");
+                                    //增加异动日志表：专业
+                                    var logentity = new StuInfoBasic_ChangeLogEntity()
+                                    {
+                                        FieldName = "专业",
+                                        BeforeChange = entity.MajorNo,
+                                        AfterChange = entity.NewMajorNo,
+                                        UpdateBy = loginUserInfo.userId,
+                                        UpdateTime = now,
+                                        StuID = stuInfoBasicEntity.StuId,
+                                        StuChangeType = entity.StuChangeType,
+                                        StuChangeRemark = entity.StuChangeRemark,
+                                        StuChangeId = entity.Id
+                                    };
+                                    logentity.Create();
+                                    logList.Add(logentity);
+                                    //增加异动日志表：班级
+                                    var logentity2 = new StuInfoBasic_ChangeLogEntity()
+                                    {
+                                        FieldName = "班级",
+                                        BeforeChange = entity.ClassNo,
+                                        AfterChange = entity.NewClassNo,
+                                        UpdateBy = loginUserInfo.userId,
+                                        UpdateTime = now,
+                                        StuID = stuInfoBasicEntity.StuId,
+                                        StuChangeType = entity.StuChangeType,
+                                        StuChangeRemark = entity.StuChangeRemark,
+                                        StuChangeId = entity.Id
+                                    };
+                                    logentity2.Create();
+                                    logList.Add(logentity2);
+                                }
+                            }
+                            else
+                            {
+                                if (stuInfoBasicEntity.ClassNo != entity.NewClassNo)
+                                {
+                                    var classInfoEntity2 = db.FindEntity<ClassInfoEntity>(x => x.ClassNo == entity.NewClassNo);
+                                    if (classInfoEntity2 != null)
+                                    {
+                                        if (stuInfoBasicEntity.Grade != classInfoEntity2.Grade)
+                                        {
+                                            //增加异动日志表：年级
+                                            var logentity2 = new StuInfoBasic_ChangeLogEntity()
+                                            {
+                                                FieldName = "年级",
+                                                BeforeChange = stuInfoBasicEntity.Grade,
+                                                AfterChange = classInfoEntity2.Grade,
+                                                UpdateBy = loginUserInfo.userId,
+                                                UpdateTime = now,
+                                                StuID = stuInfoBasicEntity.StuId,
+                                                StuChangeType = entity.StuChangeType,
+                                                StuChangeRemark = entity.StuChangeRemark,
+                                                StuChangeId = entity.Id
+                                            };
+                                            logentity2.Create();
+                                            logList.Add(logentity2);
+                                        }
+                                        //改学籍信息表；
+                                        db.ExecuteBySql($"update StuInfoBasic set MajorNo='{entity.NewMajorNo}',ClassNo='{entity.NewClassNo}',Grade='{classInfoEntity2.Grade}' where StuNo='{entity.StuNo}' ");
+                                        //增加异动日志表：班级
+                                        var logentity = new StuInfoBasic_ChangeLogEntity()
+                                        {
+                                            FieldName = "班级",
+                                            BeforeChange = entity.ClassNo,
+                                            AfterChange = entity.NewClassNo,
+                                            UpdateBy = loginUserInfo.userId,
+                                            UpdateTime = now,
+                                            StuID = stuInfoBasicEntity.StuId,
+                                            StuChangeType = entity.StuChangeType,
+                                            StuChangeRemark = entity.StuChangeRemark,
+                                            StuChangeId = entity.Id
+                                        };
+                                        logentity.Create();
+                                        logList.Add(logentity);
+                                    }
+                                }
+                            }
+                        }
+                        db.Insert(logList);
 
-                    //修改状态
-                    entity.CheckTime = DateTime.Now;
-                    entity.CheckUserId = LoginUserInfo.Get().account;
-                    entity.CheckStatus = 1;
-                    db.Update(entity);
+                        //修改异动表：审批状态、审批人、
+                        entity.CheckTime = now;
+                        entity.CheckUserId = loginUserInfo.userId;
+                        entity.CheckStatus = 1;
+                        db.Update(entity);
+                    }
                 }
                 db.Commit();
             }
@@ -204,23 +389,31 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 if (entity != null)
                 {
                     //处理数据
-                    if (entity.StuChangeType == "01" || entity.StuChangeType == "02" || entity.StuChangeType == "03")   //降级、转班、转专业
+                    if (entity.StuChangeType == "01" || entity.StuChangeType == "07" || entity.StuChangeType == "08")   //降级、转班、转专业、
                     {
-                        //改信息；
+                        //改学籍信息；
                         var classInfoEntity = db.FindEntity<ClassInfoEntity>(x => x.ClassNo == entity.ClassNo);
                         if (classInfoEntity != null)
                         {
                             db.ExecuteBySql($"update StuInfoBasic set DeptNo='{entity.DeptNo}',MajorNo='{entity.MajorNo}',ClassNo='{entity.ClassNo}',Grade='{classInfoEntity.Grade}' where StuNo='{entity.StuNo}' ");
                         }
                     }
-                    else if (entity.StuChangeType == "04" || entity.StuChangeType == "05")  //退学、休学
+                    else if (entity.StuChangeType == "02" || entity.StuChangeType == "05" || entity.StuChangeType == "06")  //转校、退学、休学
                     {
-                        //改信息；显示成绩；
+                        //改学籍信息（异动状态为null表示显示成绩）；
                         db.ExecuteBySql($"update StuInfoBasic set ChangeStatus=null where StuNo='{entity.StuNo}' ");
                     }
+                    else if (entity.StuChangeType == "03")  //复学
+                    {
+                        //改学籍信息（异动状态为1表示不显示成绩）；
+                        db.ExecuteBySql($"update StuInfoBasic set ChangeStatus=1 where StuNo='{entity.StuNo}' ");
+                    }
 
-                    //修改状态
+                    //修改异动表：审批状态、审批人、
                     db.ExecuteBySql("update StuInfoBasicChange set CheckTime=null,CheckUserId=null,CheckStatus=0 where Id='" + keyValue + "' ");
+                    //删除异动日志表：学籍异动主键id
+                    db.ExecuteBySql("delete from StuInfoBasic_ChangeLog where StuChangeId='" + keyValue + "' ");
+
                 }
                 db.Commit();
             }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic_ChangeLog/StuInfoBasic_ChangeLogEntity.cs

@@ -51,6 +51,21 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// </summary>
         [Column("STUID")]
         public string StuID { get; set; }
+        /// <summary>
+        /// 学籍异动类型（留级01，转出/校02，复学03，转入/进04，退学05，休学06，转班07，转专业08，学籍关键信息更改09）
+        /// </summary>
+        [Column("STUCHANGETYPE")]
+        public string StuChangeType { get; set; }
+        /// <summary>
+        /// 学籍异动备注
+        /// </summary>
+        [Column("STUCHANGEREMARK")]
+        public string StuChangeRemark { get; set; }
+        /// <summary>
+        /// StuInfoBasicChange主键
+        /// </summary>
+        [Column("STUCHANGEID")]
+        public string StuChangeId { get; set; }
         #endregion
 
         #region  扩展操作

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic_ChangeLog/StuInfoBasic_ChangeLogService.cs

@@ -29,16 +29,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             try
             {
                 var strSql = new StringBuilder();
-                strSql.Append("SELECT ");
-                strSql.Append(@"
-                t.ID,
-                t.FieldName,
-                t.BeforeChange,
-                t.AfterChange,
-                t.UpdateBy,
-                t.UpdateTime,
-                t.StuID
-                ");
+                strSql.Append("SELECT t.*");
                 strSql.Append("  FROM StuInfoBasic_ChangeLog t ");
                 strSql.Append("  WHERE 1=1 ");
                 var queryParam = queryJson.ToJObject();
@@ -57,7 +48,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
                 if (!queryParam["StuID"].IsEmpty())
                 {
-                    dp.Add("StuID", "" + queryParam["StuID"].ToString() + "", DbType.String);
+                    dp.Add("StuID", queryParam["StuID"].ToString(), DbType.String);
                     strSql.Append(" AND t.StuID = @StuID ");
                 }
                 if (!queryParam["UpdateTime"].IsEmpty())
@@ -67,8 +58,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
                 if (!queryParam["UpdateBy"].IsEmpty())
                 {
-                    dp.Add("UpdateBy", "%" + queryParam["UpdateBy"].ToString() + "%", DbType.String);
-                    strSql.Append(" AND t.UpdateBy Like @UpdateBy ");
+                    dp.Add("UpdateBy", queryParam["UpdateBy"].ToString(), DbType.String);
+                    strSql.Append(" AND t.UpdateBy = @UpdateBy ");
                 }
                 return this.BaseRepository("CollegeMIS").FindList<StuInfoBasic_ChangeLogEntity>(strSql.ToString(),dp, pagination);
             }

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

@@ -1902,6 +1902,10 @@
     <Compile Include="PersonnelManagement\EvaluateTeachLearn\EvaluateTeachLearnService.cs" />
     <Compile Include="PersonnelManagement\EvaluateTeachLearn\EvaluateTeachLearnBLL.cs" />
     <Compile Include="PersonnelManagement\EvaluateTeachLearn\EvaluateTeachLearnIBLL.cs" />
+    <Compile Include="PersonnelManagement\ClassPatrol\ClassPatrolEntity.cs" />
+    <Compile Include="PersonnelManagement\ClassPatrol\ClassPatrolService.cs" />
+    <Compile Include="PersonnelManagement\ClassPatrol\ClassPatrolBLL.cs" />
+    <Compile Include="PersonnelManagement\ClassPatrol\ClassPatrolIBLL.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/PersonnelManagement/ClassPatrol/ClassPatrolBLL.cs

@@ -0,0 +1,125 @@
+using Learun.Util;
+using System;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.PersonnelManagement
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-08-25 11:16
+    /// 描 述：课堂巡查
+    /// </summary>
+    public class ClassPatrolBLL : ClassPatrolIBLL
+    {
+        private ClassPatrolService classPatrolService = new ClassPatrolService();
+
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<ClassPatrolEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return classPatrolService.GetPageList(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取ClassPatrol表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public ClassPatrolEntity GetClassPatrolEntity(string keyValue)
+        {
+            try
+            {
+                return classPatrolService.GetClassPatrolEntity(keyValue);
+            }
+            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
+            {
+                classPatrolService.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>
+        /// <returns></returns>
+        public void SaveEntity(string keyValue, ClassPatrolEntity entity)
+        {
+            try
+            {
+                classPatrolService.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/PersonnelManagement/ClassPatrol/ClassPatrolEntity.cs

@@ -0,0 +1,95 @@
+using Learun.Util;
+using System;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Learun.Application.TwoDevelopment.PersonnelManagement
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-08-25 11:16
+    /// 描 述：课堂巡查
+    /// </summary>
+    public class ClassPatrolEntity 
+    {
+        #region 实体成员
+        /// <summary>
+        /// Id
+        /// </summary>
+        [Column("ID")]
+        public string Id { get; set; }
+        /// <summary>
+        /// 时间
+        /// </summary>
+        [Column("TIME")]
+        public DateTime? Time { get; set; }
+        /// <summary>
+        /// 课节
+        /// </summary>
+        [Column("SECTION")]
+        public string Section { get; set; }
+        /// <summary>
+        /// 教师
+        /// </summary>
+        [Column("EMPNO")]
+        public string EmpNo { get; set; }
+        /// <summary>
+        /// 科目
+        /// </summary>
+        [Column("LESSONNO")]
+        public string LessonNo { get; set; }
+        /// <summary>
+        /// 情况记载
+        /// </summary>
+        [Column("RECORDS")]
+        public string Records { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        [Column("REMARK")]
+        public string Remark { get; set; }
+        /// <summary>
+        /// CreateUserId
+        /// </summary>
+        [Column("CREATEUSERID")]
+        public string CreateUserId { get; set; }
+        /// <summary>
+        /// CreateTime
+        /// </summary>
+        [Column("CREATETIME")]
+        public DateTime? CreateTime { get; set; }
+        /// <summary>
+        /// ModifyUserId
+        /// </summary>
+        [Column("MODIFYUSERID")]
+        public string ModifyUserId { get; set; }
+        /// <summary>
+        /// ModifyTime
+        /// </summary>
+        [Column("MODIFYTIME")]
+        public DateTime? ModifyTime { 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/PersonnelManagement/ClassPatrol/ClassPatrolIBLL.cs

@@ -0,0 +1,48 @@
+using Learun.Util;
+using System.Data;
+using System.Collections.Generic;
+
+namespace Learun.Application.TwoDevelopment.PersonnelManagement
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-08-25 11:16
+    /// 描 述：课堂巡查
+    /// </summary>
+    public interface ClassPatrolIBLL
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        IEnumerable<ClassPatrolEntity> GetPageList(Pagination pagination, string queryJson);
+        /// <summary>
+        /// 获取ClassPatrol表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        ClassPatrolEntity GetClassPatrolEntity(string keyValue);
+        #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, ClassPatrolEntity entity);
+        #endregion
+
+    }
+}

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/ClassPatrol/ClassPatrolService.cs

@@ -0,0 +1,156 @@
+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.PersonnelManagement
+{
+    /// <summary>
+    /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架
+    /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+    /// 创 建：超级管理员
+    /// 日 期：2022-08-25 11:16
+    /// 描 述：课堂巡查
+    /// </summary>
+    public class ClassPatrolService : RepositoryFactory
+    {
+        #region 获取数据
+
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">查询参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<ClassPatrolEntity> GetPageList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT t.* ");
+                strSql.Append("  FROM ClassPatrol t ");
+                strSql.Append("  WHERE 1=1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["Section"].IsEmpty())
+                {
+                    dp.Add("Section", "%" + queryParam["Section"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND t.Section Like @Section ");
+                }
+                if (!queryParam["EmpNo"].IsEmpty())
+                {
+                    dp.Add("EmpNo",queryParam["EmpNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.EmpNo = @EmpNo ");
+                }
+                if (!queryParam["LessonNo"].IsEmpty())
+                {
+                    dp.Add("LessonNo",queryParam["LessonNo"].ToString(), DbType.String);
+                    strSql.Append(" AND t.LessonNo = @LessonNo ");
+                }
+                return this.BaseRepository("CollegeMIS").FindList<ClassPatrolEntity>(strSql.ToString(),dp, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 获取ClassPatrol表实体数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        public ClassPatrolEntity GetClassPatrolEntity(string keyValue)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindEntity<ClassPatrolEntity>(keyValue);
+            }
+            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<ClassPatrolEntity>(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>
+        public void SaveEntity(string keyValue, ClassPatrolEntity 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/PersonnelManagement/DutySchedule/DutyScheduleBLL.cs

@@ -66,6 +66,28 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
             }
         }
 
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <returns>返回列表</returns>
+        public IEnumerable<DutyScheduleEntity> GetList()
+        {
+            try
+            {
+                return dutyScheduleService.GetList();
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
         #endregion
 
         #region  提交数据

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DutySchedule/DutyScheduleIBLL.cs

@@ -27,6 +27,12 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         /// <summary>
         /// <returns></returns>
         DutyScheduleEntity GetDutyScheduleEntity(string keyValue);
+        /// <summary>
+        /// 获取所有数据
+        /// </summary>
+        /// <returns></returns>
+        IEnumerable<DutyScheduleEntity> GetList();
+
         #endregion
 
         #region  提交数据

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DutySchedule/DutyScheduleService.cs

@@ -28,21 +28,27 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         {
             try
             {
+                var adms = this.BaseRepository().getDbConnection().Database;
                 var strSql = new StringBuilder();
                 strSql.Append("SELECT ");
-                strSql.Append(@"
-                t.ID,
-                t.StartTime,
-                t.EndTime,
-                t.Person,
-                t.Remark,u.F_Account,F_RealName
-                ");
-                strSql.Append("  FROM DutySchedule t left join adms7ultimate2.dbo.LR_Base_User u on t.Person=u.F_UserId ");
+                strSql.Append(@" t.* ,u.F_Account,u.F_RealName ");
+                strSql.Append($"  FROM DutySchedule t left join {adms}.dbo.LR_Base_User u on t.Person=u.F_UserId ");
                 strSql.Append("  WHERE 1=1 ");
                 var queryParam = queryJson.ToJObject();
                 // 虚拟参数
                 var dp = new DynamicParameters(new { });
-                return this.BaseRepository("CollegeMIS").FindList<DutyScheduleEntity>(strSql.ToString(),dp, pagination);
+                if (!queryParam["keyword"].IsEmpty())
+                {
+                    dp.Add("keyword", "%" + queryParam["keyword"].ToString() + "%", DbType.String);
+                    strSql.Append(" AND  u.F_RealName Like @keyword ");
+                }
+                if (!queryParam["StartTime"].IsEmpty() && !queryParam["EndTime"].IsEmpty())
+                {
+                    dp.Add("startTime", queryParam["StartTime"].ToDate(), DbType.DateTime);
+                    dp.Add("endTime", queryParam["EndTime"].ToDate(), DbType.DateTime);
+                    strSql.Append(" AND ( t.StartTime >= @startTime AND t.EndTime <= @endTime ) ");
+                }
+                return this.BaseRepository("CollegeMIS").FindList<DutyScheduleEntity>(strSql.ToString(), dp, pagination);
             }
             catch (Exception ex)
             {
@@ -81,6 +87,29 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
             }
         }
 
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <returns>返回列表</returns>
+        public IEnumerable<DutyScheduleEntity> GetList()
+        {
+            try
+            {
+                var adms = this.BaseRepository().getDbConnection().Database;
+                var strSql = new StringBuilder();
+                strSql.Append("SELECT ");
+                strSql.Append(@" t.*, u.F_Account,F_RealName ");
+                strSql.Append($"  FROM DutySchedule t left join {adms}.dbo.LR_Base_User u on t.Person=u.F_UserId ");
+                return this.BaseRepository("CollegeMIS").FindList<DutyScheduleEntity>(strSql.ToString());
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                    throw;
+                else
+                    throw ExceptionEx.ThrowServiceException(ex);
+            }
+        }
         #endregion
 
         #region  提交数据
@@ -94,7 +123,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         {
             try
             {
-                this.BaseRepository("CollegeMIS").Delete<DutyScheduleEntity>(t=>t.ID == keyValue);
+                this.BaseRepository("CollegeMIS").Delete<DutyScheduleEntity>(t => t.ID == keyValue);
             }
             catch (Exception ex)
             {
@@ -126,6 +155,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
                 else
                 {
                     entity.Create();
+                    entity.CreateTime = DateTime.Now;
                     this.BaseRepository("CollegeMIS").Insert(entity);
                 }
             }

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/home/notice.vue

@@ -31,15 +31,17 @@ export default {
     async init() {
       this.LOADING('加载中…')
       const noticeItem = this.GET_PARAM()
-
       this.content = this.CONVERT_HTML(noticeItem.f_content)
-
       this.time = moment(noticeItem.f_time).format('HH : mm')
       this.date = moment(noticeItem.f_time).format('YYYY年 M月 D日')
       this.SET_TITLE(noticeItem.f_title)
 
       this.ready = true
       this.HIDE_LOADING()
+	  let _postData = {
+	  	newsId: noticeItem.f_id,
+	  }
+	  this.HTTP_POST('learun/news/newsRead',_postData, '加载数据时出错');
     }
   }
 }