合并

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

@@ -97,6 +97,15 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         {
             return View();
         }
+        /// <summary>
+        /// 审核页
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult CheckForm()
+        {
+            return View();
+        }
         #endregion
 
         #region 获取数据

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

@@ -294,6 +294,7 @@ var bootstrap = function ($, learun) {
                     url: top.$.rootUrl + '/EducationalAdministration/Exam_ExamTeacherTime/Index',
                     width: 1000,
                     height: 600,
+                    btn: null,
                     callBack: function (id) {
                         return top[id].acceptClick(refreshGirdData);
                     }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlanLesson/FormClass.js

@@ -92,7 +92,7 @@ var bootstrap = function ($, learun) {
         page.search();
     };
     // 保存数据
-    acceptClick = function (callBack,i) {
+    acceptClick = function (callBack, i) {
         var selectedRow = $('#gridtable').jfGridGet('rowdata');
         if (selectedRow.length == 0) {
             return learun.alert.warning("请选择班级！");

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

@@ -4,7 +4,6 @@
  * 日  期：2022-06-13 15:41
  * 描  述：老师时间管理
  */
-var acceptClick;
 var refreshGirdData;
 var bootstrap = function ($, learun) {
     "use strict";
@@ -143,11 +142,5 @@ var bootstrap = function ($, learun) {
     refreshGirdData = function () {
         $('#gridtable').jfGridSet('reload');
     };
-    acceptClick = function(callBack) {
-        if (!!callBack) {
-            learun.layerClose(window.name);
-            callBack();
-        }
-    };
     page.init();
 }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/CheckForm.cshtml

@@ -0,0 +1,15 @@
+@{
+    ViewBag.Title = "学籍异动列表审核";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">审核状态<font face="宋体">*</font></div>
+        <div id="F_EnabledMark" isvalid="yes"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item">
+        <div class="lr-form-item-title">审核用户<font face="宋体">*</font></div>
+        <input id="CheckUserId" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"  readonly/>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuTransferInfo/CheckForm.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/CheckForm.js

@@ -0,0 +1,43 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2023-01-04 15:03
+ * 描  述：学籍异动列表
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.initData();
+            page.bind();
+        },
+        bind: function () {
+            $('#F_EnabledMark').lrselect({
+                data: [{ text: "同意", value: "1" }, { text: "作废", value: "2" }],
+                text: "text",
+                value: "value"
+            });
+            $('#CheckUserId')[0].lrvalue = learun.clientdata.get(['userinfo']).userId;
+            $('#CheckUserId').val(learun.clientdata.get(['userinfo']).realName);
+        },
+        initData: function () {
+           
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('#form').lrValidform()) {
+            return false;
+        }
+        var postData = $('#form').lrGetFormData();
+        $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuTransferInfo/CheckForm?keyValue=' + keyValue, postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/CheckIndex.js

@@ -47,16 +47,23 @@ var bootstrap = function ($, learun) {
             $('#lr_check').on('click', function () {
                 var keyValue = $('#gridtable').jfGridValue('ID');
                 if (learun.checkrow(keyValue)) {
-                    var CheckMark = $('#gridtable').jfGridValue('CheckMark');
+                    var CheckMark = $('#gridtable').jfGridValue('F_EnabledMark');
                     if (CheckMark.indexOf('1') != -1) {
-                        learun.alert.warning("选中记录中包含已审核项目，已审核项不能二次审核！");
+                        learun.alert.warning("选中记录中包含已审核项，已审核项不能二次审核！");
                         return;
                     }
-                    learun.layerConfirm('是否确认审核选中项进行学籍异动,该项不可逆转！', function (res) {
-                        if (res) {
-                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuTransferInfo/CheckForm', { keyValue: keyValue }, function () {
-                                refreshGirdData();
-                            });
+                    if (CheckMark.indexOf('2') != -1) {
+                        learun.alert.warning("选中记录中包含已作废项，不可审核！");
+                        return;
+                    }
+                    learun.layerForm({
+                        id: 'form',
+                        title: '审核页面',
+                        url: top.$.rootUrl + '/EducationalAdministration/StuTransferInfo/CheckForm?keyValue=' + keyValue,
+                        width: 400,
+                        height: 300,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
                         }
                     });
                 }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/DropOutIndex.js

@@ -715,7 +715,7 @@ var bootstrap = function ($, learun) {
                         }, [])
                         //console.log('resources', list)
                     }
-                    console.log(list)
+                    //console.log(list)
                     tempdatra = list
                     $('#selgridtab').jfGridSet('refreshdata', tempdatra);
                 }
@@ -733,6 +733,3 @@ var bootstrap = function ($, learun) {
     };
     page.init();
 }
-function delbtn() {
-    console.log('111111')
-}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/MajorIndex.js

@@ -420,7 +420,7 @@ var bootstrap = function ($, learun) {
                 var selgridtab = $('#selgridtab').jfGridGet('rowdatas');
                 $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuTransferInfo/SaveForm', { entity: entity, strStuEntity: JSON.stringify(selgridtab) },
                     function (res) {
-                        console.log(res)
+                        //console.log(res)
                         if (res.code == 200) {
                             setTimeout(function () {
                                 location.reload();
@@ -827,8 +827,8 @@ var bootstrap = function ($, learun) {
                 rows: 100,
                 isMultiselect: true,
                 onSelectRow: function (rowdata, type) {
-                    console.log(rowdata)
-                    console.log(type)
+                    //console.log(rowdata)
+                    //console.log(type)
 
                     if (type) {
                         var selectedRow = $('#gridtable').jfGridGet('rowdata');

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RestAgainIndex.cshtml

@@ -114,7 +114,7 @@
                 <div class="lr-form-wrap" style="height:30%;" id="form">
                     <div class="col-xs-3 lr-form-item">
                         <div class="lr-form-item-title">异动类型<font face="宋体">*</font></div>
-                        <div id="AnomalousType" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"></div>
+                        <div id="AnomalousType" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly="readonly" ></div>
                     </div>
                     <div class="col-xs-3 lr-form-item">
                         <div class="lr-form-item-title">注销账号<font face="宋体">*</font></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RestAgainIndex.js

@@ -19,7 +19,25 @@ var bootstrap = function ($, learun) {
                 } 
             })
             $('#SubmitBtn').on('click', function () {
-                console.log('123465')
+                if (!$('body').lrValidform()) {
+                    return false;
+                }
+                var entity = $('body').lrGetFormData();
+                var selgridtab = $('#selgridtab').jfGridGet('rowdatas');
+                $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuTransferInfo/SaveForm', { entity: entity, strStuEntity: JSON.stringify(selgridtab) },
+                    function (res) {
+                        //console.log(res)
+                        if (res.code == 200) {
+                            setTimeout(function () {
+                                location.reload();
+                            }, 100)
+                        }
+                        // 保存成功后才回调
+                        //if (!!callBack) {
+                        //    callBack(res);
+                        //}
+                    }
+                );
             })
             $("#EducationExperienceReturn").attr("src", "/EducationalAdministration/StuTransferInfo/ReturnIndex");
 
@@ -138,7 +156,8 @@ var bootstrap = function ($, learun) {
             });
             //提交下拉框
           
-            $('#AnomalousType').lrDataItemSelect({ code: 'StuChangeType'});
+            $('#AnomalousType').lrDataItemSelect({ code: 'StuChangeType' });
+            $('#AnomalousType').lrselectSet("06");
             $('#StuStatus').lrDataItemSelect({ code: 'YesOrNoInt' });
             $('#F_WriteMark').lrDataItemSelect({ code: 'YesOrNoInt' });
             // 刷新
@@ -729,7 +748,7 @@ var bootstrap = function ($, learun) {
                         }, [])
                         //console.log('resources', list)
                     }
-                    console.log(list)
+                    //console.log(list)
                     tempdatra = list
                     $('#selgridtab').jfGridSet('refreshdata', tempdatra);
                 }
@@ -747,6 +766,3 @@ var bootstrap = function ($, learun) {
     };
     page.init();
 }
-function delbtn() {
-    console.log('111111')
-}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/ReturnIndex.cshtml

@@ -39,10 +39,10 @@
                     </div>
 
                     @*<div class="lr-layout-tool-item">
-                        <div class="lr-query-btn" style="padding:0 10px;" id="listitem">
-                            点击
-                        </div>
-                    </div>*@
+                            <div class="lr-query-btn" style="padding:0 10px;" id="listitem">
+                                点击
+                            </div>
+                        </div>*@
                 </div>
                 <div class="lr-layout-tool-right">
                     <div class=" btn-group btn-group-sm">
@@ -56,7 +56,7 @@
             <div class="lr-form-wrap" style="height:40%;" id="form">
                 <div class="col-xs-6 lr-form-item">
                     <div class="lr-form-item-title">异动类型<font face="宋体">*</font></div>
-                    <div id="AnomalousType" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"></div>
+                    <div id="NewAnomalousType" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly="readonly"></div>
                 </div>
                 <div class="col-xs-6 lr-form-item">
                     <div class="lr-form-item-title">恢复学籍<font face="宋体">*</font></div>
@@ -78,20 +78,20 @@
                     <div class="lr-form-item-title">专业<font face="宋体">*</font></div>
                     <div id="NewMajorNo" isvalid="yes" checkexpession="NotNull"></div>
                 </div>
-                <div class="col-xs-6 lr-form-item">
-                    <div class="lr-form-item-title">班级<font face="宋体">*</font></div>
-                    <div id="NewClassNo" isvalid="yes" checkexpession="NotNull"></div>
-                </div>
                 <div class="col-xs-6 lr-form-item">
                     <div class="lr-form-item-title">年级<font face="宋体">*</font></div>
                     <div id="NewGrade" type="text" class="form-control" isvalid="yes" checkexpession="NotNull"></div>
                 </div>
+                <div class="col-xs-6 lr-form-item">
+                    <div class="lr-form-item-title">班级<font face="宋体">*</font></div>
+                    <div id="NewClassNo" isvalid="yes" checkexpession="NotNull"></div>
+                </div>
                 <div class="col-xs-12 lr-form-item">
                     <div class="lr-form-item-title">异动原因</div>
                     <textarea id="Remark" class="form-control" style="height: 100px;"></textarea>
                 </div>
             </div>
-        
+
             <div id="SubmitBtn" style="margin:0 auto;cursor:pointer;margin-bottom:10px; position:relative; width:80px; height:28px;line-height:28px;border-radius:4px; background:#039cfd;color:#FFF;text-align:center;">
                 提交
             </div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/ReturnIndex.js

@@ -14,7 +14,26 @@ var bootstrap = function ($, learun) {
                 page.search(queryJson);
             }, 280, 400);
             $('#SubmitBtn').on('click', function () {
-                console.log('123465')
+                if (!$('body').lrValidform()) {
+                    return false;
+                }
+                var entity = $('body').lrGetFormData();
+                entity.AnomalousType = entity.NewAnomalousType;
+                var selgridtab = $('#selgridtab').jfGridGet('rowdatas');
+                $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuTransferInfo/SaveForm', { entity: entity, strStuEntity: JSON.stringify(selgridtab) },
+                    function (res) {
+                        //console.log(res)
+                        if (res.code == 200) {
+                            setTimeout(function () {
+                                location.reload();
+                            }, 100)
+                        }
+                        // 保存成功后才回调
+                        //if (!!callBack) {
+                        //    callBack(res);
+                        //}
+                    }
+                );
             })
             $('#DeptNo').lrselect({
                 allowSearch: true,
@@ -128,6 +147,7 @@ var bootstrap = function ($, learun) {
             });
 
             //提交下拉框
+            $('#AnomalousType').lrDataItemSelect({ code: 'StuChangeType' });
             $('#NewDeptNo').lrselect({
                 allowSearch: true,
                 value: "deptno",
@@ -238,9 +258,10 @@ var bootstrap = function ($, learun) {
                 value: "classno",
                 text: "classname"
             });
-            $('#AnomalousType').lrDataItemSelect({ code: 'StuChangeType'});
             $('#RecoverWriteMark').lrDataItemSelect({ code: 'YesOrNoInt' });
             $('#RecoverStuStatus').lrDataItemSelect({ code: 'YesOrNoInt' });
+            $('#NewAnomalousType').lrDataItemSelect({ code: 'StuChangeType' });
+            $('#NewAnomalousType').lrselectSet("03");
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
@@ -428,8 +449,8 @@ var bootstrap = function ($, learun) {
                     //        return cellvalue == "1" ? "<span class=\"label label-success\">已审核</span>" : "<span class=\"label label-danger\">未审核</span>";
                     //    }
                     //},
-                    { label: "学生编号", name: "StuNo", width: 100, align: "left", ishide: true, },
-                    { label: "学籍号", name: "StuCode", width: 100, align: "left", ishide: true, },
+                    { label: "学生编号", name: "StuNo", width: 100, align: "left" },
+                    { label: "学籍号", name: "StuCode", width: 100, align: "left" },
                     { label: "学号", name: "ProvinceCode", width: 100, align: "left" },
                     { label: "姓名", name: "StuName", width: 100, align: "left" },
                     {
@@ -829,7 +850,7 @@ var bootstrap = function ($, learun) {
                         }, [])
                         //console.log('resources', list)
                     }
-                    console.log(list)
+                    //console.log(list)
                     tempdatra = list
                     $('#selgridtab').jfGridSet('refreshdata', tempdatra);
                 }
@@ -839,7 +860,7 @@ var bootstrap = function ($, learun) {
         },
         search: function (param) {
             param = param || {};
-            param.SqlParameter = ' and (AnomalousType =03 or AnomalousType=02 or AnomalousType=06 ) and IsReturnSchool=0 ';
+            param.SqlParameter = ' and AnomalousType=06  and IsReturnSchool=1 and F_EnabledMark=1 ';
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };
@@ -848,6 +869,3 @@ var bootstrap = function ($, learun) {
     };
     page.init();
 }
-function delbtn() {
-    console.log('111111')
-}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/RolloffIndex.js

@@ -733,7 +733,7 @@ var bootstrap = function ($, learun) {
                         }, [])
                         //console.log('resources', list)
                     }
-                    console.log(list)
+                    //console.log(list)
                     tempdatra = list
                     $('#selgridtab').jfGridSet('refreshdata', tempdatra);
                 }
@@ -751,6 +751,3 @@ var bootstrap = function ($, learun) {
     };
     page.init();
 }
-function delbtn() {
-    console.log('111111')
-}

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

@@ -1362,6 +1362,7 @@
     <Content Include="Areas\EducationalAdministration\Views\StuScore\ScoreQueryAllIndexTeacher.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuScore\ScoreQueryAllIndex.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\CheckIndex.js" />
+    <Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\CheckForm.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\RolloffIndex.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\ReturnIndex.js" />
     <Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\IntoIndex.js" />
@@ -8049,6 +8050,7 @@
     <Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\IntoIndex.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\ReturnIndex.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\RolloffIndex.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\StuTransferInfo\CheckForm.cshtml" />
     <None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <Content Include="Views\Login\Default-beifen.cshtml" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamLesson/Exam_ExamLessonService.cs

@@ -266,7 +266,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
            ,[LessonNo]
            ,[ELOrder]
            ,[ELEnabled],ExamTime,LessonTypeId,DeptNo,MajorNo)
-select NEWID(),AcademicYearNo,t.Semester,Grade,t.LessonName,t.[LessonNo],0,1,'{ExamTime}',a.lessontypeid,t.DeptNo,t.MajorNo from OpenLessonPlan t
+select NEWID(),AcademicYearNo,t.Semester,replace(Grade,'级','') Grade,t.LessonName,t.[LessonNo],0,1,'{ExamTime}',a.lessontypeid,t.DeptNo,t.MajorNo from OpenLessonPlan t
 left join lessoninfo a on t.lessonno=a.lessonno
  where t.ExamType='1'  and t.lessonsortno=1 and t.AcademicYearNo='{AcademicYearNo}' and t.Semester='{Semester}'
  and t.[LessonNo] not in (select [LessonNo] from Exam_ExamLesson where AcademicYearNo='{AcademicYearNo}' and Semester='{Semester}' )

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlanClass/Exam_ExamPlanClassService.cs

@@ -265,6 +265,15 @@ and examtime is not null and datediff(day, examdate, '{examPlanLesson.ExamDate}'
                 //{
                 //    entity.ClassStuNum = stuinfo.Count(x => x.ClassNo == entity.ClassNo);
                 //}
+                var classList = this.BaseRepository("CollegeMIS").FindList<ClassInfoEntity>(x => x.CheckMark == true);
+                if (list.Exists(x => string.IsNullOrEmpty(x.ClassName)))
+                {
+                    foreach (var item in list.Where(x => string.IsNullOrEmpty(x.ClassName)).ToList())
+                    {
+                        item.ClassName = classList.Where(x => x.ClassNo == item.ClassNo).FirstOrDefault().ClassName;
+                    }
+                }
+
                 this.BaseRepository("CollegeMIS").Insert(list);
                 //更新排考安排课程表实排班级数、实排人数
                 //排考安排课程表Id