From 4b53c387237cbe5e9b4675a197226c9854cad8b3 Mon Sep 17 00:00:00 2001 From: ndbs Date: Mon, 26 Jun 2023 11:08:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E7=B1=8D=E5=BC=82=E5=8A=A8=E9=80=80?= =?UTF-8?q?=E5=AD=A6=20=E6=B7=BB=E5=8A=A0=E6=81=A2=E5=A4=8D=E5=AD=A6?= =?UTF-8?q?=E7=B1=8D=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/StuTransferInfoController.cs | 7 +- .../Views/StuTransferInfo/DropOutIndex.cshtml | 201 ++++--- .../Views/StuTransferInfo/DropOutIndex.js | 46 ++ .../Views/StuTransferInfo/Index.cshtml | 4 +- .../StuTransferInfo/ReinstateIndex.cshtml | 101 ++++ .../Views/StuTransferInfo/ReinstateIndex.js | 518 ++++++++++++++++++ .../Learun.Application.Web.csproj | 2 + .../StuTransferInfo/StuTransferInfoEntity.cs | 2 +- .../StuTransferInfo/StuTransferInfoService.cs | 232 +++++++- 9 files changed, 1034 insertions(+), 79 deletions(-) create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/ReinstateIndex.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/ReinstateIndex.js diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuTransferInfoController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuTransferInfoController.cs index 2cdcfaf5a..f9a6a65e7 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuTransferInfoController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuTransferInfoController.cs @@ -103,6 +103,11 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { return View(); } + [HttpGet] + public ActionResult ReinstateIndex() + { + return View(); + } /// /// 综合查询-基本信息 /// @@ -241,7 +246,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers StuTransferInfoEntity entity = strEntity.ToObject(); entity.AnomalousType = "04"; entity.ChangeReason = "转入"; - entity.StuId= Guid.NewGuid().ToString(); + entity.StuId = Guid.NewGuid().ToString(); stuTransferInfoIBLL.SaveEntity(keyValue, entity); return Success("保存成功！"); } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/DropOutIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/DropOutIndex.cshtml index 9bd4a2b57..50624dd80 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/DropOutIndex.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/DropOutIndex.cshtml @@ -2,87 +2,144 @@ ViewBag.Title = "学籍异动列表"; Layout = "~/Views/Shared/_Index.cshtml"; } -
-
-
-
-
-
-
-
-
-
系部
-
-
-
-
专业
-
-
-
-
年级
-
-
-
-
班级
-
-
-
-
姓名
- -
-
-
身份证号
- -
-
-
学号
- + + +
+
+
+
+
+
+
+
+
+
+
+
系部
+
+
+
+
专业
+
+
+
+
年级
+
+
+
+
班级
+
+
+
+
姓名
+ +
+
+
身份证号
+ +
+
+
学号
+ +
+
-
- - @*
-
- 点击 +
+
+
-
*@ -
-
-
- +
-
-
-
+
-
-
-
-
异动类型*
-
-
-
-
注销账号*
-
-
-
-
保留学籍*
-
-
-
-
离班日期*
- -
-
-
异动原因
- +
+
+
+
异动类型*
+
+
+
+
注销账号*
+
+
+
+
保留学籍*
+
+
+
+
离班日期*
+ +
+
+
异动原因
+ +
+
+
+ 提交 +
-
- 提交 -
+
+ +
+ + @Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuTransferInfo/DropOutIndex.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/DropOutIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/DropOutIndex.js index fcb4110e7..e64059eb4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/DropOutIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/DropOutIndex.js @@ -10,6 +10,52 @@ var bootstrap = function ($, learun) { page.bind(); }, bind: function () { + $('#navultab li').on('click', function () { + if (!$(this).hasClass('active')) { + $(this).parent().find('.active').removeClass('active'); + $(this).addClass('active'); + $('#condivtab .condiv').eq($(this).index()).siblings().hide() + $('#condivtab .condiv').eq($(this).index()).show() + } + }) + $('#SubmitBtn').on('click', function () { + + if (!$('body').lrValidform()) { + return false; + } + var entity = $('body').lrGetFormData(); + let starttime = new Date(entity.SuspensionBeginTime).getTime(); + let endtime = new Date(entity.SuspensionEndTime).getTime(); + if (endtime < starttime) { + learun.alert.warning("起始日期不能大于终止日期！"); + return false; + } + + if (parseInt(Math.abs(endtime - starttime) / 1000 / 60 / 60 / 24) < 183) { + learun.alert.warning("起始时间与终止时间不能小于半年！"); + return false; + } + + 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/ReinstateIndex"); + + + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { page.search(queryJson); }, 280, 400); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/Index.cshtml index fbd2225df..3aab7649c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/Index.cshtml @@ -59,9 +59,9 @@
-
+
- 添加退学异动 + 添加退学异动/恢复学籍
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/ReinstateIndex.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/ReinstateIndex.cshtml new file mode 100644 index 000000000..4d55be4ca --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/ReinstateIndex.cshtml @@ -0,0 +1,101 @@ +@{ + ViewBag.Title = "学籍异动列表"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
+
+
+
+
+
+
+
+
+
姓名
+ +
+
+
学籍状态
+
+
+
+
原系部
+
+
+
+
原专业
+
+
+
+
原年级
+
+
+
+
原班级
+
+
+
+
+
+ + @*
+
+ 点击 +
+
*@ +
+
+
+ +
+
+
+
+ +
+
+
+
异动类型*
+
+
+
+
恢复学籍*
+
+
+
+
恢复账号*
+
+
+
+
入班日期*
+ +
+
+
系部*
+
+
+
+
专业*
+
+
+
+
年级*
+
+
+
+
班级*
+
+
+
+
异动原因
+ +
+
+ +
+ 提交 +
+
+
+
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/StuTransferInfo/ReinstateIndex.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/ReinstateIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/ReinstateIndex.js new file mode 100644 index 000000000..3413570b1 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuTransferInfo/ReinstateIndex.js @@ -0,0 +1,518 @@ +var refreshGirdData; +var StuId; +var tempdatra = new Array(); +var list = []; +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); + }, 280, 400); + $('#SubmitBtn').on('click', function () { + if (!$('body').lrValidform()) { + return false; + } + var entity = $('body').lrGetFormData(); + entity.AnomalousType = entity.NewAnomalousType; + var selgridtab = $('#selgridtab').jfGridGet('rowdatas'); + $.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/StuTransferInfo/SaveAgainEntity', { entity: entity, strStuTranEntity: 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, + value: "deptno", + text: "deptname", + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo', + select: function (item) { + if (item) { + $('#MajorNo').lrselectRefresh({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo', + param: { strWhere: "DeptNo='" + item.deptno + "' AND CheckMark=1" } + }); + } else { + $('#MajorNo').lrselectRefresh({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo', + param: { strWhere: "1=1 AND CheckMark=1" } + }); + } + + } + }); + $('#MajorNo').lrselect({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo', + value: "majorno", + text: "majorname", + param: { strWhere: "1=1 AND CheckMark=1" }, + select: function (item) { + var Grades = $("#Grade").lrselectGet(); + if (Grades != null && Grades != "" && Grades != "undefined") { + 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" } + }); + } 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" } + }); + } + } 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" } + }); + } 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" } + }); + } + } + } + }); + $('#Grade').lrselect({ + url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GenerateNearByYear', + value: "value", + text: "text", + select: function (item) { + var MajorNos = $("#MajorNo").lrselectGet(); + if (MajorNos != null && MajorNos != "" && MajorNos != "undefined") { + if (item) { + $('#ClassNo').lrselectRefresh({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', + param: { + strWhere: "majorno='" + MajorNos + "' AND CheckMark=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" } + }); + } + } else { + if (item) { + $('#ClassNo').lrselectRefresh({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', + param: { + strWhere: "CheckMark=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" } + }); + } + } + + } + }); + $('#ClassNo').lrselect({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', + param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }, + value: "classno", + text: "classname" + }); + + //提交下拉框 + $('#AnomalousType').lrDataItemSelect({ code: 'StuChangeType' }); + $('#NewDeptNo').lrselect({ + allowSearch: true, + value: "deptno", + text: "deptname", + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdDeptInfo', + select: function (item) { + if (item) { + $('#NewMajorNo').lrselectRefresh({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo', + param: { strWhere: "DeptNo='" + item.deptno + "' AND CheckMark=1" } + }); + } else { + $('#NewMajorNo').lrselectRefresh({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo', + param: { strWhere: "1=1 AND CheckMark=1" } + }); + } + + } + }); + $('#NewMajorNo').lrselect({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=CdMajorInfo', + value: "majorno", + text: "majorname", + param: { strWhere: "1=1 AND CheckMark=1" }, + select: function (item) { + var Grades = $("#NewGrade").lrselectGet(); + if (Grades != null && Grades != "" && Grades != "undefined") { + if (item) { + $('#NewClassNo').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" } + }); + } else { + $('#NewClassNo').lrselectRefresh({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', + param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" } + }); + } + } else { + if (item) { + $('#NewClassNo').lrselectRefresh({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', + param: { strWhere: "majorno='" + item.majorno + "' AND CheckMark=1 order by classno desc" } + }); + } else { + $('#NewClassNo').lrselectRefresh({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', + param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" } + }); + } + } + } + }); + $('#NewGrade').lrselect({ + url: top.$.rootUrl + '/EducationalAdministration/ClassInfo/GenerateNearByYear', + value: "value", + text: "text", + select: function (item) { + var MajorNos = $("#NewMajorNo").lrselectGet(); + if (MajorNos != null && MajorNos != "" && MajorNos != "undefined") { + if (item) { + $('#NewClassNo').lrselectRefresh({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', + param: { + strWhere: "majorno='" + MajorNos + "' AND CheckMark=1 AND Grade='" + item.text + "' order by classno desc" + } + }); + } else { + $('#NewClassNo').lrselectRefresh({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', + param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" } + }); + } + } else { + if (item) { + $('#NewClassNo').lrselectRefresh({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', + param: { + strWhere: "CheckMark=1 AND Grade='" + item.text + "' order by classno desc" + } + }); + } else { + $('#NewClassNo').lrselectRefresh({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', + param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" } + }); + } + } + + } + }); + $('#NewClassNo').lrselect({ + allowSearch: true, + url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=bjsj', + param: { strWhere: "1=1 AND CheckMark=1 order by classno desc" }, + value: "classno", + text: "classname" + }); + $('#RecoverWriteMark').lrDataItemSelect({ code: 'YesOrNoInt' }); + $('#RecoverStuStatus').lrDataItemSelect({ code: 'YesOrNoInt' }); + $('#NewAnomalousType').lrDataItemSelect({ code: 'StuChangeType' }); + $('#NewAnomalousType').lrselectSet("16"); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + //查看 + $('#lr_view').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('StuId'); + if (learun.checkrow(keyValue)) { + if (keyValue.indexOf(',') != -1) { + learun.alert.warning("只能选择一条记录进行查看！"); + return; + } + learun.layerForm({ + id: 'form', + title: '查看', + url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic/FormView?keyValue=' + keyValue, + width: 1162, + height: 600, + btn: null + }); + } + }); + $('#selgridtab').jfGrid({ + headData: [ + { label: "学号", name: "StuNo", width: 100, align: "left" }, + { label: "姓名", name: "StuName", width: 100, align: "left" }, + { + label: "性别", name: "GenderNo", width: 80, align: "left", + formatter: function (cellvalue) { + return cellvalue == true ? "男" : "女"; + } + }, + { + label: "出生日期", name: "Birthday", width: 100, align: "left", ishide: true, + formatter: function (value) { + return learun.formatDate(value, 'yyyy-MM-dd'); + } + }, + { label: "身份证号", name: "IdentityCardNo", width: 100, align: "left" }, + { + label: "民族", name: "NationalityNo", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'National', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { label: "年级", name: "Grade", width: 100, align: "left" }, + { + label: "系所", name: "DeptNo", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo', + key: value, + keyId: 'deptno', + callback: function (_data) { + callback(_data['deptname']); + } + }); + } + }, + { + label: "专业", name: "MajorNo", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo', + key: value, + keyId: 'majorno', + callback: function (_data) { + callback(_data['majorname']); + } + }); + } + }, + { + label: "班级", name: "ClassNo", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj', + key: value, + keyId: 'classno', + callback: function (_data) { + callback(_data['classname']); + } + }); + } + }, + { + label: "学制", name: "EduSystem", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'EduSystem', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { label: "家庭地址", name: "MailAddress", width: 100, align: "left" }, + { label: "联系电话", name: "Mobile", width: 100, align: "left" }, + { label: "户口所在地", name: "ResidencePlace", width: 100, align: "left" }, + { label: "档案所在地", name: "LocationFile", width: 100, align: "left" }, + { + label: "操作", name: "Delete", width: 100, align: "center", + formatter: function (callback, cellvalue, row, op, $cell) { + var $div = $('
'); + var $hbtn = $(' 移除'); + $hbtn.on('click', function () { + tempdatra.map((item, index) => { + if (item.StuNo == cellvalue.StuNo) { + tempdatra.splice(index, 1) + } + }); + //console.log(tempdatra) + $('#selgridtab').jfGridSet('refreshdata', tempdatra); + + }); + $div.append($hbtn); + return $div; + } + }, + ], + mainId: 'AAIId', + }); + + }, + // 初始化列表 + initGird: function () { + $('#gridtable').lrAuthorizeJfGridLei({ + url: top.$.rootUrl + '/EducationalAdministration/StuTransferInfo/GetPageList', + headData: [ + { label: "学号", name: "StuNo", width: 100, align: "left" }, + { label: "姓名", name: "StuName", width: 100, align: "left" }, + { + label: "性别", name: "Gender", width: 80, align: "left", + formatter: function (cellvalue) { + return cellvalue == true ? "男" : "女"; + } + }, + { + label: "出生日期", name: "Birthday", width: 100, align: "left", ishide: true, + formatter: function (value) { + return learun.formatDate(value, 'yyyy-MM-dd'); + } + }, + { label: "身份证号", name: "IdentityCardNo", width: 100, align: "left" }, + { + label: "民族", name: "NationalityNo", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'National', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { label: "年级", name: "Grade", width: 100, align: "left" }, + { + label: "系所", name: "DeptNo", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdDeptInfo', + key: value, + keyId: 'deptno', + callback: function (_data) { + callback(_data['deptname']); + } + }); + } + }, + { + label: "专业", name: "MajorNo", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'CdMajorInfo', + key: value, + keyId: 'majorno', + callback: function (_data) { + callback(_data['majorname']); + } + }); + } + }, + { + label: "班级", name: "ClassNo", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'bjsj', + key: value, + keyId: 'classno', + callback: function (_data) { + callback(_data['classname']); + } + }); + } + }, + { + label: "学制", name: "EduSystem", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'EduSystem', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { label: "家庭地址", name: "MailAddress", width: 100, align: "left" }, + { label: "联系电话", name: "Mobile", width: 100, align: "left" }, + { label: "户口所在地", name: "ResidencePlace", width: 100, align: "left" }, + { label: "档案所在地", name: "LocationFile", width: 100, align: "left" }, + ], + mainId: 'StuId', + isPage: true, + rows: 100, + isMultiselect: true, + onSelectRow: function (rowdata, type) { + if (type) { + list.push(rowdata) + let temp = {} + list = list.reduce((prev, curv) => { + if (temp[curv.StuNo]) { } + else { + temp[curv.StuNo] = true + prev.push(curv) + } + return prev + }, []) + //var selectedRow = $('#gridtable').jfGridGet('rowdata'); + tempdatra = list + $('#selgridtab').jfGridSet('refreshdata', tempdatra); + } + } + + }); + page.search(); + }, + search: function (param) { + param = param || {}; + param.SqlParameter = ' and (AnomalousType=05 or AnomalousType=10 or AnomalousType= 13 or AnomalousType= 14) and IsReturnSchool=0 and F_EnabledMark=1 '; + $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); + } + }; + refreshGirdData = function () { + page.search(); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj index 6197e9512..ea6024098 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj @@ -1390,6 +1390,7 @@ + @@ -8109,6 +8110,7 @@ + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuTransferInfo/StuTransferInfoEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuTransferInfo/StuTransferInfoEntity.cs index 910826610..0dbf34192 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuTransferInfo/StuTransferInfoEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuTransferInfo/StuTransferInfoEntity.cs @@ -207,7 +207,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration [Column("SUSPENSIONENDTIME")] public DateTime? SuspensionEndTime { get; set; } /// - /// 是否已复学 1是 0否【休学】 + /// 是否已复学 1是 0否【休学】/是否恢复学籍 退学,开除,注销学籍 /// /// [Column("ISRETURNSCHOOL")] diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuTransferInfo/StuTransferInfoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuTransferInfo/StuTransferInfoService.cs index da3a683bc..c2a2be497 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuTransferInfo/StuTransferInfoService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuTransferInfo/StuTransferInfoService.cs @@ -373,7 +373,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration InsertEntity.Create(); //去重验证 - if (InsertEntity.AnomalousType == "03")//复学 + if (InsertEntity.AnomalousType == "03" || InsertEntity.AnomalousType == "16")//复学 //恢复学籍 { if (this.BaseRepository("CollegeMIS").FindEntity(x => x.AnomalousType == InsertEntity.AnomalousType && x.StuId == InsertEntity.StuId && x.LeaveDate == InsertEntity.LeaveDate && @@ -440,7 +440,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration case "12": //失踪 case "13": //注销 case "14": //自动退学 - case "15": //自动退学 + case "15": //跳级 #region 复制一份学生学籍表 copyStuInfoBasic(upTrua, stulist, InsertStuTran); @@ -638,7 +638,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } #endregion } - else if (upTrua.AnomalousType == "02" || upTrua.AnomalousType == "05" || upTrua.AnomalousType == "06" || upTrua.AnomalousType == "10" || upTrua.AnomalousType == "11" || upTrua.AnomalousType == "12") + else if (upTrua.AnomalousType == "02" || upTrua.AnomalousType == "05" || upTrua.AnomalousType == "06" || upTrua.AnomalousType == "10" || upTrua.AnomalousType == "11" || upTrua.AnomalousType == "12" || upTrua.AnomalousType == "13") { if (upTrua.AnomalousType == "06") //休学保存部分基础数据 StuTransferInfo数据? { @@ -894,6 +894,232 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration db.Insert(CreateInsertStuSelectLessonList(upTrua, stulist)); } + #endregion + break; + case "16": //恢复学籍 + //学籍异动列表 + if (upTrua.IsReturnSchool == "0") + { + upTrua.IsReturnSchool = "1"; + //修改记录为已审核 + upTrua.F_EnabledMark = 1; + upTrua.CheckTime = DateTime.Now; + upTrua.CheckUserId = userInfo.userId; + //修改关联休学记录的 IsReturnSchool = 1 + db.ExecuteBySql(" update StuTransferInfo set IsReturnSchool = 1 where ID = '" + upTrua.ReturnSchoolId + "'"); + + //1.basic找，有就改；2.basictran复制并改； + if (stulist == null) + { + #region 重新生成学籍 + //复学的学籍 + var ReturnStu = db.FindEntity(x => x.StuId == upTrua.StuId); + + addTruan.StuId = ReturnStu.StuId; + addTruan.StuNo = ReturnStu.StuNo; + addTruan.StuCode = ReturnStu.StuCode; + addTruan.NoticeNo = ReturnStu.NoticeNo; + addTruan.GraduateYear = ReturnStu.GraduateYear; + addTruan.ksh = ReturnStu.ksh; + addTruan.DeptNo = upTrua.NewDeptNo; + addTruan.MajorNo = upTrua.NewMajorNo; + addTruan.MajorDetailNo = ReturnStu.MajorDetailNo; + addTruan.MajorDetailName = ReturnStu.MajorDetailName; + addTruan.Grade = upTrua.NewGrade; + addTruan.ClassNo = upTrua.NewClassNo; + addTruan.StuName = ReturnStu.StuName; + addTruan.SpellFull = ReturnStu.SpellFull; + addTruan.SpellBrief = ReturnStu.SpellBrief; + addTruan.GenderNo = ReturnStu.GenderNo; + addTruan.Birthday = ReturnStu.Birthday; + addTruan.PartyFaceNo = ReturnStu.PartyFaceNo; + addTruan.FamilyOriginNo = ReturnStu.FamilyOriginNo; + addTruan.NationalityNo = ReturnStu.NationalityNo; + addTruan.ProvinceNo = ReturnStu.ProvinceNo; + addTruan.RegionNo = ReturnStu.RegionNo; + addTruan.ResidenceNo = ReturnStu.ResidenceNo; + addTruan.TestStuSortNo = ReturnStu.TestStuSortNo; + addTruan.HealthStatusNo = ReturnStu.HealthStatusNo; + addTruan.WillNo = ReturnStu.WillNo; + addTruan.TestStuSubjectNo = ReturnStu.TestStuSubjectNo; + addTruan.GraduateNo = ReturnStu.GraduateNo; + addTruan.PlanFormNo = ReturnStu.PlanFormNo; + addTruan.IsThreeGood = ReturnStu.IsThreeGood; + addTruan.IsExcellent = ReturnStu.IsExcellent; + addTruan.IsNormalCadre = ReturnStu.IsNormalCadre; + addTruan.IsProvinceFirstThree = ReturnStu.IsProvinceFirstThree; + addTruan.OverseasChineseNo = ReturnStu.OverseasChineseNo; + addTruan.MatriculateSort = ReturnStu.MatriculateSort; + addTruan.ComeProvinceNo = ReturnStu.ComeProvinceNo; + addTruan.HighSchoolNo = ReturnStu.HighSchoolNo; + addTruan.HighSchoolName = ReturnStu.HighSchoolName; + addTruan.EntranceDate = ReturnStu.EntranceDate; + addTruan.Religion = ReturnStu.Religion; + addTruan.GoodAt = ReturnStu.GoodAt; + addTruan.IdentityCardNo = ReturnStu.IdentityCardNo; + addTruan.JoinPartyDate = ReturnStu.JoinPartyDate; + addTruan.JoinLeagueDate = ReturnStu.JoinLeagueDate; + addTruan.InSchoolAddress = ReturnStu.InSchoolAddress; + addTruan.InSchoolTelephone = ReturnStu.InSchoolTelephone; + addTruan.AbmormityMoveMark = ReturnStu.AbmormityMoveMark; + addTruan.AwardMark = ReturnStu.AwardMark; + addTruan.PunishMark = ReturnStu.PunishMark; + addTruan.LinkmanMark = ReturnStu.LinkmanMark; + addTruan.StuNoChangeMark = ReturnStu.StuNoChangeMark; + addTruan.FinishSchoolMark = ReturnStu.FinishSchoolMark; + addTruan.CurrentRegisterMark = ReturnStu.CurrentRegisterMark; + addTruan.FinishSchoolDate = ReturnStu.FinishSchoolDate; + addTruan.DiplomaNo = ReturnStu.DiplomaNo; + addTruan.DiplomaRemark = ReturnStu.DiplomaRemark; + addTruan.Remark = ReturnStu.Remark; + addTruan.RegisterDate = ReturnStu.RegisterDate; + addTruan.Photo = ReturnStu.Photo; + addTruan.TeachPlanNo = ReturnStu.TeachPlanNo; + addTruan.mobile = ReturnStu.mobile; + addTruan.EMail = ReturnStu.EMail; + addTruan.QQ = ReturnStu.QQ; + addTruan.FatherUnit = ReturnStu.FatherUnit; + addTruan.FatherName = ReturnStu.FatherName; + addTruan.FatherPhone = ReturnStu.FatherPhone; + addTruan.MatherName = ReturnStu.MatherName; + addTruan.MatherUnit = ReturnStu.MatherUnit; + addTruan.MatherPhone = ReturnStu.MatherPhone; + addTruan.username = ReturnStu.username; + addTruan.password = ReturnStu.password; + addTruan.MailAddress = ReturnStu.MailAddress; + addTruan.PostalCode = ReturnStu.PostalCode; + addTruan.InSchoolStatus = ReturnStu.InSchoolStatus; + addTruan.TransMark = ReturnStu.TransMark; + addTruan.ClassTutorNo = ReturnStu.ClassTutorNo; + addTruan.ResumeCheck = ReturnStu.ResumeCheck; + addTruan.PracStatus = ReturnStu.PracStatus; + addTruan.RegisterStatus = ReturnStu.RegisterStatus; + addTruan.PunishmentDate = ReturnStu.PunishmentDate; + addTruan.F_CityId = ReturnStu.F_CityId; + addTruan.F_CountyId = ReturnStu.F_CountyId; + addTruan.F_ProvinceId = ReturnStu.F_ProvinceId; + addTruan.F_SchoolId = ReturnStu.F_SchoolId; + addTruan.EduSystem = ReturnStu.EduSystem; + addTruan.StudyModality = ReturnStu.StudyModality; + addTruan.SyncFlag = ReturnStu.SyncFlag; + addTruan.ChangeStatus = ReturnStu.ChangeStatus; + addTruan.Balance = ReturnStu.Balance; + addTruan.HealthStatus = ReturnStu.HealthStatus; + addTruan.IdCardType = ReturnStu.IdCardType; + addTruan.EntranceWay = ReturnStu.EntranceWay; + addTruan.StudyingWay = ReturnStu.StudyingWay; + addTruan.CountryNo = ReturnStu.CountryNo; + addTruan.MarriageStatus = ReturnStu.MarriageStatus; + addTruan.TrainInterval = ReturnStu.TrainInterval; + addTruan.IsTrailChildren = ReturnStu.IsTrailChildren; + addTruan.StuPlaceCode = ReturnStu.StuPlaceCode; + addTruan.BirthPlaceCode = ReturnStu.BirthPlaceCode; + addTruan.NativePlaceCode = ReturnStu.NativePlaceCode; + addTruan.ResidencePlaceCode = ReturnStu.ResidencePlaceCode; + addTruan.BelongPolice = ReturnStu.BelongPolice; + addTruan.StuLivePlaceType = ReturnStu.StuLivePlaceType; + addTruan.StuOrigin = ReturnStu.StuOrigin; + addTruan.RecruitObject = ReturnStu.RecruitObject; + addTruan.PoorIsRecord = ReturnStu.PoorIsRecord; + addTruan.RecruitWay = ReturnStu.RecruitWay; + addTruan.RecruitCooperateType = ReturnStu.RecruitCooperateType; + addTruan.AdmissionNo = ReturnStu.AdmissionNo; + addTruan.ExamScore = ReturnStu.ExamScore; + addTruan.RecruitCooperateForm = ReturnStu.RecruitCooperateForm; + addTruan.RecruitCooperateSchoolNo = ReturnStu.RecruitCooperateSchoolNo; + addTruan.SchoolOutsidePlace = ReturnStu.SchoolOutsidePlace; + addTruan.PieceCultivateWay = ReturnStu.PieceCultivateWay; + addTruan.EnglishName = ReturnStu.EnglishName; + addTruan.OneMembership = ReturnStu.OneMembership; + addTruan.OneIsGuardian = ReturnStu.OneIsGuardian; + addTruan.OneBirthday = ReturnStu.OneBirthday; + addTruan.OneIdCardType = ReturnStu.OneIdCardType; + addTruan.OneIdCardNo = ReturnStu.OneIdCardNo; + addTruan.OneNationalityNo = ReturnStu.OneNationalityNo; + addTruan.OnePartyFaceNo = ReturnStu.OnePartyFaceNo; + addTruan.OneHealthStatus = ReturnStu.OneHealthStatus; + addTruan.OneJob = ReturnStu.OneJob; + addTruan.OnePosition = ReturnStu.OnePosition; + addTruan.TwoMembership = ReturnStu.TwoMembership; + addTruan.TwoIsGuardian = ReturnStu.TwoIsGuardian; + addTruan.TwoBirthday = ReturnStu.TwoBirthday; + addTruan.TwoIdCardType = ReturnStu.TwoIdCardType; + addTruan.TwoIdCardNo = ReturnStu.TwoIdCardNo; + addTruan.TwoNationalityNo = ReturnStu.TwoNationalityNo; + addTruan.TwoPartyFaceNo = ReturnStu.TwoPartyFaceNo; + addTruan.TwoHealthStatus = ReturnStu.TwoHealthStatus; + addTruan.TwoJob = ReturnStu.TwoJob; + addTruan.TwoPosition = ReturnStu.TwoPosition; + addTruan.ProvinceCode = ReturnStu.ProvinceCode; + addTruan.Guardian = ReturnStu.Guardian; + addTruan.GuardianPhone = ReturnStu.GuardianPhone; + addTruan.GuardianType = ReturnStu.GuardianType; + addTruan.IsSingle = ReturnStu.IsSingle; + addTruan.IsLeft = ReturnStu.IsLeft; + addTruan.IsDisability = ReturnStu.IsDisability; + addTruan.IsRunSchool = ReturnStu.IsRunSchool; + addTruan.IsDdifficulty = ReturnStu.IsDdifficulty; + addTruan.FiveYear = ReturnStu.FiveYear; + addTruan.InternshipStatus = ReturnStu.InternshipStatus; + addTruan.IsRestudy = ReturnStu.IsRestudy; + addTruan.MajorDetailSpell = ReturnStu.MajorDetailSpell; + addTruan.OneName = ReturnStu.OneName; + addTruan.TwoName = ReturnStu.TwoName; + addTruan.OtherContact = ReturnStu.OtherContact; + addTruan.OneMobile = ReturnStu.OneMobile; + addTruan.TwoMobile = ReturnStu.TwoMobile; + addTruan.ReturnBooksStatus = ReturnStu.ReturnBooksStatus; + addTruan.ReturnBooksDate = ReturnStu.ReturnBooksDate; + addTruan.EmployAgreeStatus = ReturnStu.EmployAgreeStatus; + addTruan.EmployAgreeDate = ReturnStu.EmployAgreeDate; + addTruan.FeeSettleStatus = ReturnStu.FeeSettleStatus; + addTruan.FeeSettleDate = ReturnStu.FeeSettleDate; + addTruan.CheckOutStatus = ReturnStu.CheckOutStatus; + addTruan.CheckOutDate = ReturnStu.CheckOutDate; + addTruan.CardDeregistrateStatus = ReturnStu.CardDeregistrateStatus; + addTruan.CardDeregistrateDate = ReturnStu.CardDeregistrateDate; + addTruan.DiplomaReceiveStatus = ReturnStu.DiplomaReceiveStatus; + addTruan.DiplomaReceiveDate = ReturnStu.DiplomaReceiveDate; + addTruan.FileTransferStatus = ReturnStu.FileTransferStatus; + addTruan.FileTransferDate = ReturnStu.FileTransferDate; + addTruan.TissueStatus = ReturnStu.TissueStatus; + addTruan.TissueDate = ReturnStu.TissueDate; + addTruan.DiplomaReceiveSign = ReturnStu.DiplomaReceiveSign; + addTruan.DiplomaReceiveIdcard = ReturnStu.DiplomaReceiveIdcard; + addTruan.DiplomaReceiveRemark = ReturnStu.DiplomaReceiveRemark; + addTruan.CheckMark = "0"; + db.Insert(addTruan); + #endregion + + } + else + { + stulist.DeptNo = upTrua.NewDeptNo; + stulist.MajorNo = upTrua.NewMajorNo; + stulist.ClassNo = upTrua.NewClassNo; + stulist.Grade = upTrua.NewGrade; + db.Update(stulist); + } + + if (upTrua.RecoverWriteMark == "1") //恢复账号 + { + #region 用户表 + + db1.ExecuteBySql(" update LR_Base_User set F_EnabledMark= 1 where F_EnCode='" + upTrua.StuNo + "' and F_Account ='" + upTrua.StuNo + "'and F_RealName='" + upTrua.StuName + "' and F_IdentityCardNo ='" + upTrua.IdentityCardNo + "' "); + + #endregion + } + } + + #region 课表（StuSelectLessonList，旧-写入新班级课表数据；） + + //db.Insert(CreateInsertStuSelectLessonList(upTrua, stulist)); + // wx修改 2023-3-21 课表空数据报错 ,查找同班同学 如果不为空继续执行 + if (CreateInsertStuSelectLessonList(upTrua, stulist) != null) + { + db.Insert(CreateInsertStuSelectLessonList(upTrua, stulist)); + } + #endregion break; case "04": //转入