【修改】学生毕业离校模块逻辑修改；

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

@@ -603,6 +603,19 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             stuInfoBasicIBLL.SaveFinishSchoolDate(finishDate);
             return Success("操作成功");
         }
+        /// <summary>
+        /// 学生毕业流程审核
+        /// </summary>
+        /// <param name=""></param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+
+        public ActionResult StuGraduateCheck(string keyValue)
+        {
+            stuInfoBasicIBLL.StuGraduateCheck(keyValue);
+            return Success("操作成功");
+        }
 
         /// <summary>
         /// 删除实体数据

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

@@ -133,8 +133,12 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         [AjaxOnly]
         public ActionResult GetFormData(string keyValue)
         {
-            var data = stuInfoGraduateIBLL.GetEntity(keyValue);
-            return Success(data);
+            var StuInfoGraduateData = stuInfoGraduateIBLL.GetEntity(keyValue);
+            var jsonData = new
+            {
+                StuInfoGraduate = StuInfoGraduateData,
+            };
+            return Success(jsonData);
         }
         #endregion
 

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

@@ -44,28 +44,28 @@ var bootstrap = function ($, learun) {
                         if (item) {
                             $('#ClassNo').lrselectRefresh({
                                 allowSearch: true,
-                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
-                                param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1 AND Grade='" + Grades + "' order by classno desc" }
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj',
+                                param: { strWhere: "majorno='" + item.majorno + "' AND (CheckMark=1 or (CheckMark != 1 and ClassStatus='1')) AND Grade='" + Grades + "' order by classno desc" }
                             });
                         } else {
                             $('#ClassNo').lrselectRefresh({
                                 allowSearch: true,
-                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
-                                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj',
+                                param: { strWhere: "1=1 AND (CheckMark=1 or (CheckMark != 1 and ClassStatus='1')) order by classno desc" }
                             });
                         }
                     } else {
                         if (item) {
                             $('#ClassNo').lrselectRefresh({
                                 allowSearch: true,
-                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
-                                param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1 order by classno desc" }
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj',
+                                param: { strWhere: "majorno='" + item.majorno + "' AND (CheckMark=1 or (CheckMark != 1 and ClassStatus='1')) order by classno desc" }
                             });
                         } else {
                             $('#ClassNo').lrselectRefresh({
                                 allowSearch: true,
-                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
-                                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj',
+                                param: { strWhere: "1=1 AND (CheckMark=1 or (CheckMark != 1 and ClassStatus='1')) order by classno desc" }
                             });
                         }
                     }
@@ -81,32 +81,32 @@ var bootstrap = function ($, learun) {
                         if (item) {
                             $('#ClassNo').lrselectRefresh({
                                 allowSearch: true,
-                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj',
                                 param: {
-                                    strWhere: "majorno='" + MajorNos + "' AND CheckMark=1 AND Grade='" + item.text + "' order by classno desc"
+                                    strWhere: "majorno='" + MajorNos + "' AND (CheckMark=1 or (CheckMark != 1 and ClassStatus='1')) AND Grade='" + item.text + "' order by classno desc"
                                 }
                             });
                         } else {
                             $('#ClassNo').lrselectRefresh({
                                 allowSearch: true,
-                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
-                                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj',
+                                param: { strWhere: "1=1 AND (CheckMark=1 or (CheckMark != 1 and ClassStatus='1')) order by classno desc" }
                             });
                         }
                     } else {
                         if (item) {
                             $('#ClassNo').lrselectRefresh({
                                 allowSearch: true,
-                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj',
                                 param: {
-                                    strWhere: "CheckMark=1 AND Grade='" + item.text + "' order by classno desc"
+                                    strWhere: "1=1 AND (CheckMark=1 or (CheckMark != 1 and ClassStatus='1')) AND Grade='" + item.text + "' order by classno desc"
                                 }
                             });
                         } else {
                             $('#ClassNo').lrselectRefresh({
                                 allowSearch: true,
-                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
-                                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj',
+                                param: { strWhere: "1=1 AND (CheckMark=1 or (CheckMark != 1 and ClassStatus='1')) order by classno desc" }
                             });
                         }
                     }
@@ -115,8 +115,8 @@ var bootstrap = function ($, learun) {
             });
             $('#ClassNo').lrselect({
                 allowSearch: true,
-                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
-                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" },
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj',
+                param: { strWhere: "1=1 AND (CheckMark=1 or (CheckMark != 1 and ClassStatus='1')) order by classno desc" },
                 value: "classno",
                 text: "classname"
             });
@@ -134,18 +134,7 @@ var bootstrap = function ($, learun) {
                 var keyValue = $('#gridtable').jfGridValue('StuId');
                 var DiplomaReceiveStatus = $('#gridtable').jfGridValue('DiplomaReceiveStatus');
                 if (learun.checkrow(keyValue)) {
-                    //if (DiplomaReceiveStatus.indexOf('1') != -1) {
-                    //    return learun.alert.warning("选中项包括已领取数据！");
-                    //}
-                    //learun.layerConfirm('是否确认领取毕业证！', function (res) {
-                    //    if (res) {
-                    //        learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GetCard', { keyValue: keyValue, status: '1' }, function () {
-                    //            refreshGirdData();
-                    //        });
-                    //    }
-                    //});
-                    if (keyValue.split(',').length > 1) {
-                        //return learun.alert.warning("只能选择一条记录进行操作！");
+                    if (keyValue.split(',').length > 1) {//多选
                         var postData = {
                             status: "1"
                         };
@@ -177,10 +166,8 @@ var bootstrap = function ($, learun) {
                 var keyValue = $('#gridtable').jfGridValue('StuId');
                 var DiplomaReceiveStatus = $('#gridtable').jfGridValue('DiplomaReceiveStatus');
                 if (learun.checkrow(keyValue)) {
-                    for (var i = 0; i < DiplomaReceiveStatus.split(',').length; i++) {
-                        if (DiplomaReceiveStatus.split(',')[i] != 1) {
-                            return learun.alert.warning("选中项包括未领取数据！");
-                        }
+                    if (DiplomaReceiveStatus != "1") {
+                        return learun.alert.warning("当前记录毕业证未领取！");
                     }
                     learun.layerConfirm('是否确认取消领取毕业证！', function (res) {
                         if (res) {
@@ -195,7 +182,7 @@ var bootstrap = function ($, learun) {
         // 初始化列表
         initGird: function () {
             $('#gridtable').jfGrid({
-                url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GetPageList',
+                url: top.$.rootUrl + '/EducationalAdministration/StuInfoGraduate/GetPageList',
                 headData: [
                     { label: "学号", name: "StuNo", width: 130, align: "left" },
                     { label: "姓名", name: "StuName", width: 100, align: "left" },
@@ -235,7 +222,7 @@ var bootstrap = function ($, learun) {
                         label: "班级", name: "ClassNo", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'allbjqj',
                                 key: value,
                                 keyId: 'classno',
                                 callback: function (_data) {
@@ -256,7 +243,7 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: "毕业证书号", name: "DiplomaNo", width: 100, align: "left" },
+                    { label: "毕业证书号", name: "DiplomaNo", width: 130, align: "left" },
                     {
                         label: '毕业状态', name: 'FinishSchoolMark', width: 100, align: "left", formatter: function (val) {
                             if (val == '0') {
@@ -284,13 +271,15 @@ var bootstrap = function ($, learun) {
                 mainId: 'StuId',
                 isPage: true,
                 rows: 100,
-                isMultiselect: true,
-
+                isMultiselect: false,
+                sidx: 'DiplomaReceiveStatus,FinishSchoolDate desc,StuNo',
+                sord: 'asc'
             });
             page.search();
         },
         search: function (param) {
             param = param || {};
+            param.FinishSchoolMark = "2";//已毕业
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

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

@@ -3,15 +3,15 @@
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap">
-    <div class="col-xs-12 lr-form-item" data-table="StuInfoBasic">
+    <div class="col-xs-12 lr-form-item" data-table="StuInfoGraduate">
         <div class="lr-form-item-title">领取人签名<font face="宋体">*</font></div>
         <input id="DiplomaReceiveSign" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-12 lr-form-item" data-table="StuInfoBasic">
+    <div class="col-xs-12 lr-form-item" data-table="StuInfoGraduate">
         <div class="lr-form-item-title">代领人身份证号</div>
         <input id="DiplomaReceiveIdcard" type="text" class="form-control" />
     </div>
-    <div class="col-xs-12 lr-form-item" data-table="StuInfoBasic">
+    <div class="col-xs-12 lr-form-item" data-table="StuInfoGraduate">
         <div class="lr-form-item-title">代领备注</div>
         <input id="DiplomaReceiveRemark" type="text" class="form-control" />
     </div>

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

@@ -23,7 +23,7 @@ var bootstrap = function ($, learun) {
         }, 
         initData: function () {
             if (!!keyValue) {
-                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GetFormData?keyValue=' + keyValue, function (data) {
+                $.lrSetForm(top.$.rootUrl + '/EducationalAdministration/StuInfoGraduate/GetFormData?keyValue=' + keyValue, function (data) {
                     for (var id in data) {
                         if (!!data[id].length && data[id].length > 0) {
                             $('#' + id).jfGridSet('refreshdata', data[id]);

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

@@ -37,7 +37,7 @@
                                     <div id="ClassNo"></div>
                                 </div>
                                 <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">准许毕业</div>
+                                    <div class="lr-form-item-title">毕业状态</div>
                                     <div id="FinishSchoolMark"></div>
                                 </div>
                             </div>

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

@@ -44,28 +44,28 @@ var bootstrap = function ($, learun) {
                         if (item) {
                             $('#ClassNo').lrselectRefresh({
                                 allowSearch: true,
-                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
-                                param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1 AND Grade='" + Grades + "' order by classno desc" }
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj',
+                                param: { strWhere: "majorno='" + item.majorno + "' AND (CheckMark=1 or (CheckMark != 1 and ClassStatus='1')) AND Grade='" + Grades + "' order by classno desc" }
                             });
                         } else {
                             $('#ClassNo').lrselectRefresh({
                                 allowSearch: true,
-                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
-                                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj',
+                                param: { strWhere: "1=1 AND (CheckMark=1 or (CheckMark != 1 and ClassStatus='1')) order by classno desc" }
                             });
                         }
                     } else {
                         if (item) {
                             $('#ClassNo').lrselectRefresh({
                                 allowSearch: true,
-                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
-                                param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1 order by classno desc" }
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj',
+                                param: { strWhere: "majorno='" + item.majorno + "' AND (CheckMark=1 or (CheckMark != 1 and ClassStatus='1')) order by classno desc" }
                             });
                         } else {
                             $('#ClassNo').lrselectRefresh({
                                 allowSearch: true,
-                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
-                                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj',
+                                param: { strWhere: "1=1 AND (CheckMark=1 or (CheckMark != 1 and ClassStatus='1')) order by classno desc" }
                             });
                         }
                     }
@@ -81,32 +81,32 @@ var bootstrap = function ($, learun) {
                         if (item) {
                             $('#ClassNo').lrselectRefresh({
                                 allowSearch: true,
-                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj',
                                 param: {
-                                    strWhere: "majorno='" + MajorNos + "' AND CheckMark=1 AND Grade='" + item.text + "' order by classno desc"
+                                    strWhere: "majorno='" + MajorNos + "' AND (CheckMark=1 or (CheckMark != 1 and ClassStatus='1')) AND Grade='" + item.text + "' order by classno desc"
                                 }
                             });
                         } else {
                             $('#ClassNo').lrselectRefresh({
                                 allowSearch: true,
-                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
-                                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj',
+                                param: { strWhere: "1=1 AND (CheckMark=1 or (CheckMark != 1 and ClassStatus='1')) order by classno desc" }
                             });
                         }
                     } else {
                         if (item) {
                             $('#ClassNo').lrselectRefresh({
                                 allowSearch: true,
-                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj',
                                 param: {
-                                    strWhere: "CheckMark=1 AND Grade='" + item.text + "' order by classno desc"
+                                    strWhere: "1=1 AND (CheckMark=1 or (CheckMark != 1 and ClassStatus='1')) AND Grade='" + item.text + "' order by classno desc"
                                 }
                             });
                         } else {
                             $('#ClassNo').lrselectRefresh({
                                 allowSearch: true,
-                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
-                                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }
+                                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj',
+                                param: { strWhere: "1=1 AND (CheckMark=1 or (CheckMark != 1 and ClassStatus='1')) order by classno desc" }
                             });
                         }
                     }
@@ -115,8 +115,8 @@ var bootstrap = function ($, learun) {
             });
             $('#ClassNo').lrselect({
                 allowSearch: true,
-                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj',
-                param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" },
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj',
+                param: { strWhere: "1=1 AND (CheckMark=1 or (CheckMark != 1 and ClassStatus='1')) order by classno desc" },
                 value: "classno",
                 text: "classname"
             });
@@ -133,7 +133,11 @@ var bootstrap = function ($, learun) {
             $('#lr_filetransfer').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('StuId');
                 var FileTransferStatus = $('#gridtable').jfGridValue('FileTransferStatus');
+                var FinishSchoolMark = $('#gridtable').jfGridValue('FinishSchoolMark');
                 if (learun.checkrow(keyValue)) {
+                    if (FinishSchoolMark.indexOf('2') != -1) {
+                        return learun.alert.warning("选中项包括已毕业数据，无法操作！");
+                    }
                     if (FileTransferStatus.indexOf('1') != -1) {
                         return learun.alert.warning("选中项包括已转出数据！");
                     }
@@ -150,7 +154,11 @@ var bootstrap = function ($, learun) {
             $('#lr_cancelfiletransfer').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('StuId');
                 var FileTransferStatus = $('#gridtable').jfGridValue('FileTransferStatus');
+                var FinishSchoolMark = $('#gridtable').jfGridValue('FinishSchoolMark');
                 if (learun.checkrow(keyValue)) {
+                    if (FinishSchoolMark.indexOf('2') != -1) {
+                        return learun.alert.warning("选中项包括已毕业数据，无法操作！");
+                    }
                     for (var i = 0; i < FileTransferStatus.split(',').length; i++) {
                         if (FileTransferStatus.split(',')[i] != 1) {
                             return learun.alert.warning("选中项包括未转出数据！");
@@ -169,7 +177,11 @@ var bootstrap = function ($, learun) {
             $('#lr_Tissue').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('StuId');
                 var FileTransferStatus = $('#gridtable').jfGridValue('TissueStatus');
+                var FinishSchoolMark = $('#gridtable').jfGridValue('FinishSchoolMark');
                 if (learun.checkrow(keyValue)) {
+                    if (FinishSchoolMark.indexOf('2') != -1) {
+                        return learun.alert.warning("选中项包括已毕业数据，无法操作！");
+                    }
                     if (FileTransferStatus.indexOf('1') != -1) {
                         return learun.alert.warning("选中项包括已转出数据！");
                     }
@@ -186,7 +198,11 @@ var bootstrap = function ($, learun) {
             $('#lr_cancelTissue').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('StuId');
                 var FileTransferStatus = $('#gridtable').jfGridValue('TissueStatus');
+                var FinishSchoolMark = $('#gridtable').jfGridValue('FinishSchoolMark');
                 if (learun.checkrow(keyValue)) {
+                    if (FinishSchoolMark.indexOf('2') != -1) {
+                        return learun.alert.warning("选中项包括已毕业数据，无法操作！");
+                    }
                     for (var i = 0; i < FileTransferStatus.split(',').length; i++) {
                         if (FileTransferStatus.split(',')[i] != 1) {
                             return learun.alert.warning("选中项包括未转出数据！");
@@ -206,7 +222,7 @@ var bootstrap = function ($, learun) {
         // 初始化列表
         initGird: function () {
             $('#gridtable').jfGrid({
-                url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/GetPageList',
+                url: top.$.rootUrl + '/EducationalAdministration/StuInfoGraduate/GetPageList',
                 headData: [
                     { label: "学号", name: "StuNo", width: 130, align: "left" },
                     { label: "姓名", name: "StuName", width: 100, align: "left" },
@@ -246,7 +262,7 @@ var bootstrap = function ($, learun) {
                         label: "班级", name: "ClassNo", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'allbjqj',
                                 key: value,
                                 keyId: 'classno',
                                 callback: function (_data) {
@@ -301,7 +317,8 @@ var bootstrap = function ($, learun) {
                 isPage: true,
                 rows: 100,
                 isMultiselect: true,
-
+                sidx: "FinishSchoolMark,StuNo",
+                sord: "asc"
             });
             page.search();
         },

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoGraduate/GraduateCheck.js

@@ -38,7 +38,7 @@ var bootstrap = function ($, learun) {
                         })
                     }
             });
-            //$('#ClassNo').lrDataSourceSelect({ code: 'bjsj', value: 'classno', text: 'classname' });
+            //$('#ClassNo').lrDataSourceSelect({ code: 'allbjqj', value: 'classno', text: 'classname' });
             $('#ClassNo').lrselect({
                 allowSearch: true,
                 url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=allbjqj',
@@ -56,17 +56,22 @@ var bootstrap = function ($, learun) {
                 location.reload();
             });
 
-            //归档
+            //审核
             $('#lr_check').on('click', function () {
-                return false;
-                
-                learun.layerConfirm('1.毕业生归档必须在6-8月份进行； <br>  2.归档后的学生信息如：操行、奖惩、成绩、毕业证书等只有通过毕业生信息管理才能查询或打印；<br> 3.毕业学生的账户将自动取消；<br> 4.学生所占的床位也将自动退掉；<br> 5.学生所在的班级置为已毕业班级；<br> 6.归档操作后不可撤消，请谨慎操作！', function (res) {
-                    if (res) {
-                        learun.httpAsync('post', top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/StuStore', {}, function () {
-                            refreshGirdData();
-                        });
+                var keyValue = $('#gridtable').jfGridValue('StuId');
+                var FinishSchoolMark = $('#gridtable').jfGridValue('FinishSchoolMark');
+                if (learun.checkrow(keyValue)) {
+                    if (FinishSchoolMark.indexOf('2') != -1) {
+                        return learun.alert.warning("选中项包括已通过审核数据，无法操作！");
                     }
-                });
+                    learun.layerConfirm('是否确认审核该毕业流程！', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/StuGraduateCheck', { keyValue: keyValue }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
             })
 
         },
@@ -75,6 +80,11 @@ var bootstrap = function ($, learun) {
             $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/EducationalAdministration/StuInfoGraduate/GetPageList',
                 headData: [
+                    {
+                        label: '毕业流程审核', name: 'FinishSchoolMark', width: 100, align: "left", formatter: function (cellvalue) {
+                            return cellvalue == "2" ? "<span class=\"label label-success\">已通过</span>" : "<span class=\"label label-danger\">未通过</span>";
+                        }
+                    },
                     { label: "学号", name: "StuNo", width: 130, align: "left" },
                     { label: "姓名", name: "StuName", width: 100, align: "left" },
                     {
@@ -113,7 +123,7 @@ var bootstrap = function ($, learun) {
                         label: "班级", name: "ClassNo", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj',
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'allbjqj',
                                 key: value,
                                 keyId: 'classno',
                                 callback: function (_data) {
@@ -134,7 +144,7 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: "毕业证书号", name: "DiplomaNo", width: 100, align: "left" },
+                    { label: "毕业证书号", name: "DiplomaNo", width: 130, align: "left" },
                     {
                         label: '毕业状态', name: 'FinishSchoolMark', width: 100, align: "left", formatter: function (val) {
                             if (val == '0') {
@@ -179,12 +189,12 @@ var bootstrap = function ($, learun) {
                         }
                     },
                     { label: "校园卡注销时间", name: "CardDeregistrateDate", width: 130, align: "left" },
-                    {
-                        label: "毕业证领取状态", name: "DiplomaReceiveStatus", width: 100, align: "left", formatter: function (cellvalue) {
-                            return cellvalue == "1" ? "已领取" : "未领取"
-                        }
-                    },
-                    { label: "毕业证领取时间", name: "DiplomaReceiveDate", width: 130, align: "left" },
+                    //{
+                    //    label: "毕业证领取状态", name: "DiplomaReceiveStatus", width: 100, align: "left", formatter: function (cellvalue) {
+                    //        return cellvalue == "1" ? "已领取" : "未领取"
+                    //    }
+                    //},
+                    //{ label: "毕业证领取时间", name: "DiplomaReceiveDate", width: 130, align: "left" },
                     {
                         label: "档案转出状态", name: "FileTransferStatus", width: 100, align: "left",
                         formatter: function (cellvalue) {
@@ -204,6 +214,8 @@ var bootstrap = function ($, learun) {
                 isPage: true,
                 isMultiselect: true,
                 rows: 100,
+                sidx: 'FinishSchoolMark,StuNo',
+                sord:'asc'
             });
             page.search();
         },

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

@@ -664,7 +664,29 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
             }
         }
-
+        /// <summary>
+        /// 学生毕业流程审核
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void StuGraduateCheck(string keyValue)
+        {
+            try
+            {
+                stuInfoBasicService.StuGraduateCheck(keyValue);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
         /// <summary>
         /// 审核全部
         /// </summary>

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

@@ -106,7 +106,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         /// </summary>
         /// <param name="finishDate"></param>
         void SaveFinishSchoolDate(DateTime finishDate);
-
+        /// <summary>
+        /// 学生毕业流程审核
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        void StuGraduateCheck(string keyValue);
 
         /// <summary>
         /// 保存实体数据（新增、修改）

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

@@ -742,31 +742,23 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     {
                         foreach (var item in keyValueArr)
                         {
-                            var sql = $"UPDATE StuInfoBasic SET DiplomaReceiveStatus='{status}',DiplomaReceiveDate='{now}',DiplomaReceiveSign='{entity.DiplomaReceiveSign}',DiplomaReceiveIdcard='{entity.DiplomaReceiveIdcard}',DiplomaReceiveRemark='{entity.DiplomaReceiveRemark}' WHERE StuId='{item}'";
+                            var sql = $"UPDATE StuInfoGraduate SET DiplomaReceiveStatus='{status}',DiplomaReceiveDate='{now}',DiplomaReceiveSign='{entity.DiplomaReceiveSign}',DiplomaReceiveIdcard='{entity.DiplomaReceiveIdcard}',DiplomaReceiveRemark='{entity.DiplomaReceiveRemark}' WHERE StuId='{item}'";
                             db.ExecuteBySql(sql);
-
-                            //判断离校手续是否全办完 且 毕业状态为准许毕业，若同时满足则修改毕业状态为已毕业和毕业时间；
-                            var sql2 = $"update StuInfoBasic set FinishSchoolMark='2',FinishSchoolDate='{now}' where StuId='{item}' and FinishSchoolMark='1' and ReturnBooksStatus='1' and EmployAgreeStatus='1' and FeeSettleStatus='1' and CheckOutStatus='1' and CardDeregistrateStatus='1' and FileTransferStatus='1' and TissueStatus='1' ";
-                            db.ExecuteBySql(sql2);
                         }
                     }
-                    else
+                    else//多选
                     {
 
                         var stuIds = string.Join("','", keyValueArr);
-                        var ls = db.FindList<StuInfoBasicEntity>().Any(x => x.DiplomaReceiveStatus == "1" && keyValueArr.Contains(x.StuId));//($"select * from StuInfoBasic where DiplomaReceiveStatus='1' and StuId in ('{stuIds}')");
+                        var ls = db.FindList<StuInfoGraduateEntity>().Any(x => x.DiplomaReceiveStatus == "1" && keyValueArr.Contains(x.StuId));
                         if (ls)
                         {
                             throw new ArgumentException("已领取毕业证的不可重复操作");
                         }
                         else
                         {
-                            var sql = $"UPDATE StuInfoBasic SET DiplomaReceiveStatus='{status}',DiplomaReceiveDate='{now}',DiplomaReceiveSign=StuName,DiplomaReceiveIdcard='',DiplomaReceiveRemark='' WHERE StuId in ('{stuIds}')";
+                            var sql = $"UPDATE StuInfoGraduate SET DiplomaReceiveStatus='{status}',DiplomaReceiveDate='{now}',DiplomaReceiveSign='本人',DiplomaReceiveIdcard='',DiplomaReceiveRemark='' WHERE StuId in ('{stuIds}')";
                             db.ExecuteBySql(sql);
-
-                            //判断离校手续是否全办完 且 毕业状态为准许毕业，若同时满足则修改毕业状态为已毕业和毕业时间；
-                            var sql2 = $"update StuInfoBasic set FinishSchoolMark='2',FinishSchoolDate='{now}' where StuId in ('{stuIds}') and FinishSchoolMark='1' and ReturnBooksStatus='1' and EmployAgreeStatus='1' and FeeSettleStatus='1' and CheckOutStatus='1' and CardDeregistrateStatus='1' and FileTransferStatus='1' and TissueStatus='1' ";
-                            db.ExecuteBySql(sql2);
                         }
                     }
                 }
@@ -776,12 +768,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     var keyValueArr = keyValue.Split(',');
                     foreach (var item in keyValueArr)
                     {
-                        var sql = $"UPDATE StuInfoBasic SET DiplomaReceiveStatus='{status}',DiplomaReceiveDate=null,DiplomaReceiveSign=null,DiplomaReceiveIdcard=null,DiplomaReceiveRemark=null WHERE StuId='{item}'";
+                        var sql = $"UPDATE StuInfoGraduate SET DiplomaReceiveStatus='{status}',DiplomaReceiveDate=null,DiplomaReceiveSign=null,DiplomaReceiveIdcard=null,DiplomaReceiveRemark=null WHERE StuId='{item}'";
                         db.ExecuteBySql(sql);
-
-                        //判断毕业状态是否为已毕业，若是，则毕业状态修改为准许毕业，毕业时间为空；
-                        var sql2 = $"UPDATE StuInfoBasic SET FinishSchoolMark='1',FinishSchoolDate=null WHERE StuId='{item}' and FinishSchoolMark='2' ";
-                        db.ExecuteBySql(sql2);
                     }
                 }
 
@@ -1053,27 +1041,15 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                         if (fort == "0")
                         {
                             //档案
-                            var sql = $"UPDATE StuInfoBasic SET FileTransferStatus='{status}',FileTransferDate='{now}' WHERE StuId='{item}'";
+                            var sql = $"UPDATE StuInfoGraduate SET FileTransferStatus='{status}',FileTransferDate='{now}' WHERE StuId='{item}'";
                             db.ExecuteBySql(sql);
-
-                            //判断离校手续是否全办完 且 毕业状态为准许毕业，若同时满足则修改毕业状态为已毕业和毕业时间；
-                            var sql2 = $"update StuInfoBasic set FinishSchoolMark='2',FinishSchoolDate='{now}' where StuId='{item}' and FinishSchoolMark='1' and ReturnBooksStatus='1' and EmployAgreeStatus='1' and FeeSettleStatus='1' and CheckOutStatus='1' and CardDeregistrateStatus='1' and DiplomaReceiveStatus='1' and TissueStatus='1'";
-                            db.ExecuteBySql(sql2);
                         }
                         else
                         {
                             //组织
-                            var sql1 = $"UPDATE StuInfoBasic SET TissueStatus='{status}',TissueDate='{now}' WHERE StuId='{item}'";
+                            var sql1 = $"UPDATE StuInfoGraduate SET TissueStatus='{status}',TissueDate='{now}' WHERE StuId='{item}'";
                             db.ExecuteBySql(sql1);
-
-                            //判断离校手续是否全办完 且 毕业状态为准许毕业，若同时满足则修改毕业状态为已毕业和毕业时间；
-                            var sql2 = $"update StuInfoBasic set FinishSchoolMark='2',FinishSchoolDate='{now}' where StuId='{item}' and FinishSchoolMark='1' and ReturnBooksStatus='1' and EmployAgreeStatus='1' and FeeSettleStatus='1' and CheckOutStatus='1' and CardDeregistrateStatus='1' and DiplomaReceiveStatus='1'  and FileTransferStatus= '1'";
-                            db.ExecuteBySql(sql2);
                         }
-
-                        ////判断离校手续是否全办完 且 毕业状态为准许毕业，若同时满足则修改毕业状态为已毕业和毕业时间；
-                        //var sql2 = $"update StuInfoBasic set FinishSchoolMark='2',FinishSchoolDate='{now}' where StuId='{item}' and FinishSchoolMark='1' and ReturnBooksStatus='1' and EmployAgreeStatus='1' and FeeSettleStatus='1' and CheckOutStatus='1' and CardDeregistrateStatus='1' and DiplomaReceiveStatus='1' ";
-                        //db.ExecuteBySql(sql2);
                     }
                 }
                 else
@@ -1084,18 +1060,14 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     {
                         if (fort == "0")
                         {
-                            var sql = $"UPDATE StuInfoBasic SET FileTransferStatus='{status}',FileTransferDate=null WHERE StuId='{item}'";
+                            var sql = $"UPDATE StuInfoGraduate SET FileTransferStatus='{status}',FileTransferDate=null WHERE StuId='{item}'";
                             db.ExecuteBySql(sql);
                         }
                         else
                         {
-                            var sql1 = $"UPDATE StuInfoBasic SET TissueStatus='{status}',TissueDate=null WHERE StuId='{item}'";
+                            var sql1 = $"UPDATE StuInfoGraduate SET TissueStatus='{status}',TissueDate=null WHERE StuId='{item}'";
                             db.ExecuteBySql(sql1);
                         }
-
-                        //判断毕业状态是否为已毕业，若是，则毕业状态修改为准许毕业，毕业时间为空；
-                        var sql2 = $"UPDATE StuInfoBasic SET FinishSchoolMark='1',FinishSchoolDate=null WHERE StuId='{item}' and FinishSchoolMark='2' ";
-                        db.ExecuteBySql(sql2);
                     }
                 }
 
@@ -1220,7 +1192,39 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
             }
         }
+        /// <summary>
+        /// 学生毕业流程审核
+        /// <param name="keyValue">主键</param>
+        /// <summary>
+        /// <returns></returns>
+        public void StuGraduateCheck(string keyValue)
+        {
+            var db = this.BaseRepository("CollegeMIS").BeginTrans();
+            try
+            {
+                var keyValueArr = keyValue.Split(',');
+                foreach (var item in keyValueArr)
+                {
+                    //审核通过的条件：准许毕业、毕业证书号、离校手续六项已完成，三个条件需要同时满足；
+                    var sql = $"UPDATE StuInfoGraduate SET FinishSchoolMark='2' WHERE StuId='{item}' and FinishSchoolMark='1' and DiplomaNo is not null and Len(DiplomaNo)>0 and ReturnBooksStatus='1' and EmployAgreeStatus='1' and FeeSettleStatus='1' and CheckOutStatus='1' and CardDeregistrateStatus='1' and FileTransferStatus='1' and TissueStatus='1' ";
+                    db.ExecuteBySql(sql);
+                }
 
+                db.Commit();
+            }
+            catch (Exception ex)
+            {
+                db.Rollback();
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
 
         /// <summary>
         /// 保存实体数据（新增、修改）