From eb2e8db462a74f895284b6416943c97225564ba9 Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Fri, 26 Aug 2022 16:39:27 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E5=AD=A6?= =?UTF-8?q?=E7=B1=8D=E5=BC=82=E5=8A=A8=E7=AE=A1=E7=90=86=EF=BC=9A=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=87=A0=E7=A7=8D=E5=BC=82=E5=8A=A8=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=EF=BC=9B=E5=BC=82=E5=8A=A8=E6=93=8D=E4=BD=9C=E5=90=8E=E8=AE=A1?= =?UTF-8?q?=E5=85=A5=E5=BC=82=E5=8A=A8=E6=97=A5=E5=BF=97=E8=A1=A8=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StuInfoBasicChangeController.cs | 2 +- .../Views/StuInfoBasicChange/Form.cshtml | 8 +- .../Views/StuInfoBasicChange/Form.js | 75 +++--- .../Views/StuInfoBasic_ChangeLog/Index.cshtml | 15 +- .../Views/StuInfoBasic_ChangeLog/Index.js | 48 +++- .../StuInfoBasic/StuInfoBasicEntity.cs | 2 +- .../StuInfoBasic/StuInfoBasicService.cs | 67 +++-- .../StuInfoBasicChangeEntity.cs | 6 +- .../StuInfoBasicChangeService.cs | 237 ++++++++++++++++-- .../StuInfoBasic_ChangeLogEntity.cs | 15 ++ .../StuInfoBasic_ChangeLogService.cs | 17 +- 11 files changed, 383 insertions(+), 109 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoBasicChangeController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoBasicChangeController.cs index 952067fec..70567beae 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoBasicChangeController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/StuInfoBasicChangeController.cs @@ -116,7 +116,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers var loginUserInfo = LoginUserInfo.Get(); entity.CreateTime = DateTime.Now; - entity.CreateUserId = loginUserInfo.account; + entity.CreateUserId = loginUserInfo.userId; entity.CheckStatus = 0; stuInfoBasicChangeIBLL.SaveEntity(keyValue, entity); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Form.cshtml index d0b4c7d6e..79f5acba6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Form.cshtml @@ -29,11 +29,11 @@
学籍异动前信息
系部*
-
+
专业*
-
+
班级*
@@ -47,20 +47,20 @@
新专业
-
+
新班级
-
异动说明
+
异动说明
备注
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Form.js index ac6ce31c1..114114e35 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Form.js @@ -32,37 +32,37 @@ var bootstrap = function ($, learun) { $("#NewMajorNo").siblings('div').html($("#NewMajorNo").siblings('div').attr('data-title') + '*'); $("#NewClassNo").siblings('div').html($("#NewClassNo").siblings('div').attr('data-title') + '*'); $(".NewContainer").show(); + $('#OutSchool').removeAttr("isvalid"); + $('#OutSchool').removeAttr("checkexpession"); + $("#OutSchool").siblings('div').html($("#OutSchool").siblings('div').attr('data-title')); + $('#OutSchool').val(''); $(".NewSchool").hide(); - if (item.id === "01" ) { //留级 - $(".NewSchool").hide(); + if (item.id === "01" || item.id === "07") { //留级、转班 $(".NewContainer").find('.contentDiv.zhuanban').removeAttr('readonly'); $("#NewDeptNo").lrselectSet($("#DeptNo").lrselectGet()); $("#NewMajorNo").lrselectSet($("#MajorNo").lrselectGet()); - $('#OutSchool').val(''); } else if (item.id === "02") {//转校 - $(".NewSchool").show(); $(".NewContainer").find('.contentDiv').removeAttr("isvalid"); $(".NewContainer").find('.contentDiv').removeAttr("checkexpession"); $(".NewContainer").find('.contentDiv').removeAttr('readonly'); - $(".NewSchool").find('.OutSchool').attr("isvalid", 'yes'); - $(".NewSchool").find('.OutSchool').attr("checkexpession"); - $(".NewSchool").find('.OutSchool').attr('readonly'); $("#NewDeptNo").siblings('div').html($("#NewDeptNo").siblings('div').attr('data-title')); $("#NewMajorNo").siblings('div').html($("#NewMajorNo").siblings('div').attr('data-title')); $("#NewClassNo").siblings('div').html($("#NewClassNo").siblings('div').attr('data-title')); $(".NewContainer").hide(); + $('#OutSchool').attr("isvalid", 'yes'); + $('#OutSchool').attr("checkexpession", "NotNull"); + $("#OutSchool").siblings('div').html($("#OutSchool").siblings('div').attr('data-title') + '*'); + $(".NewSchool").show(); } else if (item.id === "03") { //复学 - $(".NewSchool").hide(); - $(".NewContainer").find('.contentDiv').removeAttr('readonly'); - $(".NewSchool").find('.OutSchool').attr("isvalid", "Null"); - $('#OutSchool').val(''); - } else if (item.id === "04") { //转入 - $(".NewSchool").hide(); - $(".NewContainer").find('.contentDiv').removeAttr('readonly'); - $(".NewSchool").find('.OutSchool').attr("isvalid", "Null"); - $('#OutSchool').val(''); + $("#NewDeptNo").lrselectSet($("#DeptNo").lrselectGet()); + $("#NewMajorNo").lrselectSet($("#MajorNo").lrselectGet()); + $("#NewClassNo").lrselectSet($("#ClassNo").lrselectGet()); + } else if (item.id === "04") { //转入/进 + learun.alert.warning("异动转进请点击学籍信息管理-异动转入按钮！"); + $("#StuNo").val(""); + $("#StuName").val(""); } - else { //退学、休学、 + else if (item.id === "05" || item.id === "06") { //退学、休学、 $(".NewContainer").find('.contentDiv').removeAttr("isvalid"); $(".NewContainer").find('.contentDiv').removeAttr("checkexpession"); $(".NewContainer").find('.contentDiv').removeAttr('readonly'); @@ -70,8 +70,11 @@ var bootstrap = function ($, learun) { $("#NewMajorNo").siblings('div').html($("#NewMajorNo").siblings('div').attr('data-title')); $("#NewClassNo").siblings('div').html($("#NewClassNo").siblings('div').attr('data-title')); $(".NewContainer").hide(); - $(".NewSchool").hide(); - $('#OutSchool').val(''); + } + else if (item.id === "08") { //转专业、 + $(".NewContainer").find('.contentDiv.zhuanzhuanye').removeAttr('readonly'); + $(".NewContainer").find('.contentDiv.zhuanban').removeAttr('readonly'); + $("#NewDeptNo").lrselectSet($("#DeptNo").lrselectGet()); } } @@ -171,29 +174,33 @@ var bootstrap = function ($, learun) { $("#NewMajorNo").siblings('div').html($("#NewMajorNo").siblings('div').attr('data-title') + '*'); $("#NewClassNo").siblings('div').html($("#NewClassNo").siblings('div').attr('data-title') + '*'); $(".NewContainer").show(); - if (data[id].StuChangeType == "01") { //降级、转班 + $('#OutSchool').removeAttr("isvalid"); + $('#OutSchool').removeAttr("checkexpession"); + $("#OutSchool").siblings('div').html($("#OutSchool").siblings('div').attr('data-title')); + $('#OutSchool').val(''); + $(".NewSchool").hide(); + if (data[id].StuChangeType == "01" || data[id].StuChangeType == "07") { //留级、转班 $(".NewContainer").find('.contentDiv.zhuanban').removeAttr('readonly'); - $(".NewSchool").hide(); - $('#OutSchool').val(''); } else if (data[id].StuChangeType == "02") {//转校 - $(".NewSchool").show(); $(".NewContainer").find('.contentDiv').removeAttr("isvalid"); $(".NewContainer").find('.contentDiv').removeAttr("checkexpession"); $(".NewContainer").find('.contentDiv').removeAttr('readonly'); - $(".NewSchool").find('.OutSchool').attr("isvalid"); - $(".NewSchool").find('.OutSchool').attr("checkexpession"); - $(".NewSchool").find('.OutSchool').attr('readonly'); $("#NewDeptNo").siblings('div').html($("#NewDeptNo").siblings('div').attr('data-title')); $("#NewMajorNo").siblings('div').html($("#NewMajorNo").siblings('div').attr('data-title')); $("#NewClassNo").siblings('div').html($("#NewClassNo").siblings('div').attr('data-title')); $(".NewContainer").hide(); - } else if (data[id].StuChangeType == "03") { //转专业 + $('#OutSchool').attr("isvalid", 'yes'); + $('#OutSchool').attr("checkexpession", "NotNull"); + $("#OutSchool").siblings('div').html($("#OutSchool").siblings('div').attr('data-title') + '*'); + $(".NewSchool").show(); + } else if (data[id].StuChangeType == "03") { //复学 $(".NewContainer").find('.contentDiv').removeAttr('readonly'); - $(".NewSchool").hide(); - $('#OutSchool').val(''); - } - else { //退学、休学、转校 + } else if (data[id].StuChangeType == "04") { //转入/进 + learun.alert.warning("异动转进请点击学籍信息管理-异动转入按钮！"); + $("#StuNo").val(""); + $("#StuName").val(""); + } else if (data[id].StuChangeType == "05" || data[id].StuChangeType == "06") { //退学、休学、 $(".NewContainer").find('.contentDiv').removeAttr("isvalid"); $(".NewContainer").find('.contentDiv').removeAttr("checkexpession"); $(".NewContainer").find('.contentDiv').removeAttr('readonly'); @@ -201,8 +208,10 @@ var bootstrap = function ($, learun) { $("#NewMajorNo").siblings('div').html($("#NewMajorNo").siblings('div').attr('data-title')); $("#NewClassNo").siblings('div').html($("#NewClassNo").siblings('div').attr('data-title')); $(".NewContainer").hide(); - $(".NewSchool").hide(); - $('#OutSchool').val(''); + } + else if (data[id].StuChangeType == "08") { //转专业、 + $(".NewContainer").find('.contentDiv.zhuanzhuanye').removeAttr('readonly'); + $(".NewContainer").find('.contentDiv.zhuanban').removeAttr('readonly'); } } } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_ChangeLog/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_ChangeLog/Index.cshtml index 53741d3a1..84f632f14 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_ChangeLog/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_ChangeLog/Index.cshtml @@ -2,6 +2,9 @@ ViewBag.Title = "学籍信息异动"; Layout = "~/Views/Shared/_Index.cshtml"; } +
@@ -14,16 +17,20 @@
-
字段
+
异动类型
+
+
+
+
修改属性
-
学生主键
- +
学生姓名
+
修改人
- +
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_ChangeLog/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_ChangeLog/Index.js index 7ff4fcd7a..a3cffab8a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_ChangeLog/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasic_ChangeLog/Index.js @@ -45,6 +45,10 @@ var bootstrap = function ($, learun) { $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { page.search(queryJson); }, 220, 400); + $('#StuChangeType').lrDataItemSelect({ code: 'StuChangeType' }); + $('#StuID').lrDataSourceSelect({ code: 'StuInfoBasic', value: 'stuid', text: 'stuname' }); + $('#UpdateBy').lrDataSourceSelect({ code: 'BaseUser', value: 'f_account', text: 'f_realname' }); + // 刷新 $('#lr_refresh').on('click', function () { location.reload(); @@ -98,9 +102,35 @@ var bootstrap = function ($, learun) { }, // 初始化列表 initGird: function () { - $('#gridtable').lrAuthorizeJfGrid({ + $('#gridtable').jfGrid({ url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic_ChangeLog/GetPageList', headData: [ + { + label: "异动类型", name: "StuChangeType", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('dataItem', { + key: value, + code: 'StuChangeType', + callback: function (_data) { + callback(_data.text); + } + }); + } + }, + { label: "异动备注", name: "StuChangeRemark", width: 250, align: "left" }, + { + label: "学生姓名", name: "StuID", width: 100, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'StuInfoBasic', + key: value, + keyId: 'stuid', + callback: function (_data) { + callback(_data['stuname']); + } + }); + } + }, { label: "修改属性", name: "FieldName", width: 200, align: "left" }, { label: "修改前", name: "BeforeChange", width: 200, align: "left" }, { label: "修改后", name: "AfterChange", width: 200, align: "left" }, @@ -110,7 +140,7 @@ var bootstrap = function ($, learun) { learun.clientdata.getAsync('custmerData', { url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser', key: value, - keyId: 'f_account', + keyId: 'f_userid', callback: function (_data) { callback(_data['f_realname']); } @@ -119,7 +149,6 @@ var bootstrap = function ($, learun) { }, { label: "修改时间", name: "UpdateTime", width: 200, align: "left" }, - { label: "数据主键", name: "StuID", width: 250, align: "left" }, ], mainId: 'ID', isPage: true, @@ -130,9 +159,18 @@ var bootstrap = function ($, learun) { search: function (param) { param = param || {}; - if ($("#StuID").val() != "" && $("#StuID").length > 0) { - param.StuID = $("#StuID").val(); + + //赋值 + if (stuId != "" && stuId != undefined && stuId != null) { + $('#StuID').lrselectSet(stuId); + $('#StuID').attr('readonly', 'readonly'); + $('#StuID').parent().attr('display','none'); + param.StuID = stuId; + } else { + $('#StuID').removeAttr('readonly'); + $('#StuID').parent().attr('display', 'block'); } + param.StartTime = startTime; param.EndTime = endTime; $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs index fa19beea7..a91cc5a86 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs @@ -464,7 +464,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration [Column("STUDYMODALITY")] public string StudyModality { get; set; } /// - /// 学籍异动状态 + /// 学籍异动状态（1表示不显示成绩） /// /// [Column("CHANGESTATUS")] diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs index 8eb9af102..63c57af88 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicService.cs @@ -1064,17 +1064,18 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// public void SaveEntity(string keyValue, StuInfoBasicEntity entity) { + var db = this.BaseRepository("CollegeMIS").BeginTrans(); try { UserIBLL userIBLL = new UserBLL(); + var loginUser = LoginUserInfo.Get(); if (!string.IsNullOrEmpty(keyValue)) { entity.Modify(keyValue); - var oldEntity = this.BaseRepository("CollegeMIS").FindEntity(keyValue); + var oldEntity = db.FindEntity(keyValue); List list = new List(); - var loginUser = LoginUserInfo.Get(); - var tableInfos = this.BaseRepository("CollegeMIS").FindTable(@"SELECT t.[name] AS 表名,c.[name] AS 字段名,cast(ep.[value] + var tableInfos = db.FindTable(@"SELECT t.[name] AS 表名,c.[name] AS 字段名,cast(ep.[value] as varchar(100)) AS [字段说明] FROM sys.tables AS t INNER JOIN sys.columns @@ -1111,7 +1112,9 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration AfterChange = newValue.ToString(), FieldName = columnName, UpdateBy = loginUser.userId, - UpdateTime = DateTime.Now + UpdateTime = DateTime.Now, + StuChangeType="09", + StuChangeRemark="点击学籍信息管理-修改按钮进行操作" }; changeEntity.Create(); list.Add(changeEntity); @@ -1121,7 +1124,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration if (list.Count > 0) { - this.BaseRepository("CollegeMIS").Insert(list); + db.Insert(list); } @@ -1142,37 +1145,55 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration userIBLL.SaveEntity(baseUser.F_UserId, baseUser); } - this.BaseRepository("CollegeMIS").Update(entity); + db.Update(entity); } else { entity.Create(); - if (entity.IsTran == "0") + if (entity.IsTran == "0")//转入/进 { - StuInfoBasicChangeEntity stuinfoChange = new StuInfoBasicChangeEntity + //学籍异动表 + //StuInfoBasicChangeEntity stuinfoChange = new StuInfoBasicChangeEntity + //{ + // Id = Guid.NewGuid().ToString(), + // StuNo = entity.StuNo, + // StuName = entity.StuName, + // DeptNo = entity.DeptNo, + // MajorNo = entity.MajorNo, + // ClassNo = entity.ClassNo, + // StuChangeRemark = entity.Remark, + // NewDeptNo = entity.DeptNo, + // NewMajorNo = entity.MajorNo, + // NewClassNo = entity.ClassNo, + // CreateUserId = entity.StuNo, + // StuChangeType = "04", + // StuChangeReason = "10", + // CreateTime = DateTime.Now, + //}; + //db.Insert(stuinfoChange); + //学籍异动日志表 + var changeEntity = new StuInfoBasic_ChangeLogEntity { - Id = Guid.NewGuid().ToString(), - StuNo = entity.StuNo, - StuName = entity.StuName, - DeptNo = entity.DeptNo, - MajorNo = entity.MajorNo, - ClassNo = entity.ClassNo, - StuChangeRemark = entity.Remark, - NewDeptNo = entity.DeptNo, - NewMajorNo = entity.MajorNo, - NewClassNo = entity.ClassNo, - CreateUserId = entity.StuNo, + StuID = entity.StuId, + BeforeChange = "", + AfterChange = "", + FieldName = "", + UpdateBy = loginUser.userId, + UpdateTime = DateTime.Now, StuChangeType = "04", - StuChangeReason = "10", - CreateTime = DateTime.Now, + StuChangeRemark = "点击学籍信息管理-异动转入按钮进行操作" }; - this.BaseRepository("CollegeMIS").Insert(stuinfoChange); + changeEntity.Create(); + db.Insert(changeEntity); } - this.BaseRepository("CollegeMIS").Insert(entity); + db.Insert(entity); } + + db.Commit(); } catch (Exception ex) { + db.Rollback(); if (ex is ExceptionEx) { throw; diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeEntity.cs index b58c8c2b2..298b37876 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeEntity.cs @@ -45,17 +45,17 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration [Column("CLASSNO")] public string ClassNo { get; set; } /// - /// StuChangeType + /// 异动类型（留级01，转出/校02，复学03，转入/进04，退学05，休学06，转班07，转专业08，学籍关键信息更改09） /// [Column("STUCHANGETYPE")] public string StuChangeType { get; set; } /// - /// StuChangeReason + /// 异动原因 /// [Column("STUCHANGEREASON")] public string StuChangeReason { get; set; } /// - /// StuChangeRemark + /// 异动备注 /// [Column("STUCHANGEREMARK")] public string StuChangeRemark { get; set; } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeService.cs index 17f8e9173..b0b62d8ac 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeService.cs @@ -149,30 +149,215 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration var db = this.BaseRepository("CollegeMIS").BeginTrans(); try { + var loginUserInfo = LoginUserInfo.Get(); + var now = DateTime.Now; + var logList = new List(); var entity = db.FindEntity(x => x.Id == keyValue); if (entity != null) { - //处理数据 - if (entity.StuChangeType == "01" || entity.StuChangeType == "03") //降级、转班、转专业 + var stuInfoBasicEntity = db.FindEntity(x => x.StuNo == entity.StuNo); + if (stuInfoBasicEntity != null) { - //改信息； - var classInfoEntity = db.FindEntity(x => x.ClassNo == entity.NewClassNo); - if (classInfoEntity != null) + //处理数据 + if (entity.StuChangeType == "01" || entity.StuChangeType == "07") //降级、转班、 { - db.ExecuteBySql($"update StuInfoBasic set DeptNo='{entity.NewDeptNo}',MajorNo='{entity.NewMajorNo}',ClassNo='{entity.NewClassNo}',Grade='{classInfoEntity.Grade}' where StuNo='{entity.StuNo}' "); + if (stuInfoBasicEntity.ClassNo != entity.NewClassNo) + { + var classInfoEntity = db.FindEntity(x => x.ClassNo == entity.NewClassNo); + if (classInfoEntity != null) + { + if (stuInfoBasicEntity.Grade != classInfoEntity.Grade) + { + //增加异动日志表：年级 + var logentity2 = new StuInfoBasic_ChangeLogEntity() + { + FieldName = "年级", + BeforeChange = stuInfoBasicEntity.Grade, + AfterChange = classInfoEntity.Grade, + UpdateBy = loginUserInfo.userId, + UpdateTime = now, + StuID = stuInfoBasicEntity.StuId, + StuChangeType = entity.StuChangeType, + StuChangeRemark = entity.StuChangeRemark, + StuChangeId = entity.Id + }; + logentity2.Create(); + logList.Add(logentity2); + } + //改学籍信息表； + db.ExecuteBySql($"update StuInfoBasic set ClassNo='{entity.NewClassNo}',Grade='{classInfoEntity.Grade}' where StuNo='{entity.StuNo}' "); + //增加异动日志表：班级 + var logentity = new StuInfoBasic_ChangeLogEntity() + { + FieldName = "班级", + BeforeChange = entity.ClassNo, + AfterChange = entity.NewClassNo, + UpdateBy = loginUserInfo.userId, + UpdateTime = now, + StuID = stuInfoBasicEntity.StuId, + StuChangeType = entity.StuChangeType, + StuChangeRemark = entity.StuChangeRemark, + StuChangeId = entity.Id + }; + logentity.Create(); + logList.Add(logentity); + } + } + } - } - else if (entity.StuChangeType == "02" || entity.StuChangeType == "04") //退学、休学 - { - //改信息；不显示成绩； - db.ExecuteBySql($"update StuInfoBasic set ChangeStatus=1 where StuNo='{entity.StuNo}' "); - } + else if (entity.StuChangeType == "02" || entity.StuChangeType == "05" || entity.StuChangeType == "06") //转校、退学、休学、 + { + //增加异动日志表：学籍异动状态 + var logentity = new StuInfoBasic_ChangeLogEntity() + { + FieldName = "学籍异动状态", + BeforeChange = stuInfoBasicEntity.ChangeStatus?.ToString(), + AfterChange = "1", + UpdateBy = loginUserInfo.userId, + UpdateTime = now, + StuID = stuInfoBasicEntity.StuId, + StuChangeType = entity.StuChangeType, + StuChangeRemark = entity.StuChangeRemark, + StuChangeId = entity.Id + }; + logentity.Create(); + logList.Add(logentity); + //改学籍信息（异动状态为1表示不显示成绩）； + db.ExecuteBySql($"update StuInfoBasic set ChangeStatus=1 where StuNo='{entity.StuNo}' "); + } + else if (entity.StuChangeType == "03") //复学 + { + //增加异动日志表：学籍异动状态 + var logentity = new StuInfoBasic_ChangeLogEntity() + { + FieldName = "学籍异动状态", + BeforeChange = stuInfoBasicEntity.ChangeStatus?.ToString(), + AfterChange = "0", + UpdateBy = loginUserInfo.userId, + UpdateTime = now, + StuID = stuInfoBasicEntity.StuId, + StuChangeType = entity.StuChangeType, + StuChangeRemark = entity.StuChangeRemark, + StuChangeId = entity.Id + }; + logentity.Create(); + logList.Add(logentity); + //改学籍信息（异动状态为0表示显示成绩）； + db.ExecuteBySql($"update StuInfoBasic set ChangeStatus=null where StuNo='{entity.StuNo}' "); + } + else if (entity.StuChangeType == "08") //转专业、 + { + if (stuInfoBasicEntity.MajorNo != entity.NewMajorNo) + { + var classInfoEntity2 = db.FindEntity(x => x.ClassNo == entity.NewClassNo); + if (classInfoEntity2 != null) + { + if (stuInfoBasicEntity.Grade != classInfoEntity2.Grade) + { + //增加异动日志表：年级 + var logentity3 = new StuInfoBasic_ChangeLogEntity() + { + FieldName = "年级", + BeforeChange = stuInfoBasicEntity.Grade, + AfterChange = classInfoEntity2.Grade, + UpdateBy = loginUserInfo.userId, + UpdateTime = now, + StuID = stuInfoBasicEntity.StuId, + StuChangeType = entity.StuChangeType, + StuChangeRemark = entity.StuChangeRemark, + StuChangeId = entity.Id + }; + logentity3.Create(); + logList.Add(logentity3); + } + //改学籍信息； + db.ExecuteBySql($"update StuInfoBasic set MajorNo='{entity.NewMajorNo}',ClassNo='{entity.NewClassNo}',Grade='{classInfoEntity2.Grade}' where StuNo='{entity.StuNo}' "); + //增加异动日志表：专业 + var logentity = new StuInfoBasic_ChangeLogEntity() + { + FieldName = "专业", + BeforeChange = entity.MajorNo, + AfterChange = entity.NewMajorNo, + UpdateBy = loginUserInfo.userId, + UpdateTime = now, + StuID = stuInfoBasicEntity.StuId, + StuChangeType = entity.StuChangeType, + StuChangeRemark = entity.StuChangeRemark, + StuChangeId = entity.Id + }; + logentity.Create(); + logList.Add(logentity); + //增加异动日志表：班级 + var logentity2 = new StuInfoBasic_ChangeLogEntity() + { + FieldName = "班级", + BeforeChange = entity.ClassNo, + AfterChange = entity.NewClassNo, + UpdateBy = loginUserInfo.userId, + UpdateTime = now, + StuID = stuInfoBasicEntity.StuId, + StuChangeType = entity.StuChangeType, + StuChangeRemark = entity.StuChangeRemark, + StuChangeId = entity.Id + }; + logentity2.Create(); + logList.Add(logentity2); + } + } + else + { + if (stuInfoBasicEntity.ClassNo != entity.NewClassNo) + { + var classInfoEntity2 = db.FindEntity(x => x.ClassNo == entity.NewClassNo); + if (classInfoEntity2 != null) + { + if (stuInfoBasicEntity.Grade != classInfoEntity2.Grade) + { + //增加异动日志表：年级 + var logentity2 = new StuInfoBasic_ChangeLogEntity() + { + FieldName = "年级", + BeforeChange = stuInfoBasicEntity.Grade, + AfterChange = classInfoEntity2.Grade, + UpdateBy = loginUserInfo.userId, + UpdateTime = now, + StuID = stuInfoBasicEntity.StuId, + StuChangeType = entity.StuChangeType, + StuChangeRemark = entity.StuChangeRemark, + StuChangeId = entity.Id + }; + logentity2.Create(); + logList.Add(logentity2); + } + //改学籍信息表； + db.ExecuteBySql($"update StuInfoBasic set MajorNo='{entity.NewMajorNo}',ClassNo='{entity.NewClassNo}',Grade='{classInfoEntity2.Grade}' where StuNo='{entity.StuNo}' "); + //增加异动日志表：班级 + var logentity = new StuInfoBasic_ChangeLogEntity() + { + FieldName = "班级", + BeforeChange = entity.ClassNo, + AfterChange = entity.NewClassNo, + UpdateBy = loginUserInfo.userId, + UpdateTime = now, + StuID = stuInfoBasicEntity.StuId, + StuChangeType = entity.StuChangeType, + StuChangeRemark = entity.StuChangeRemark, + StuChangeId = entity.Id + }; + logentity.Create(); + logList.Add(logentity); + } + } + } + } + db.Insert(logList); - //修改状态 - entity.CheckTime = DateTime.Now; - entity.CheckUserId = LoginUserInfo.Get().account; - entity.CheckStatus = 1; - db.Update(entity); + //修改异动表：审批状态、审批人、 + entity.CheckTime = now; + entity.CheckUserId = loginUserInfo.userId; + entity.CheckStatus = 1; + db.Update(entity); + } } db.Commit(); } @@ -204,23 +389,31 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration if (entity != null) { //处理数据 - if (entity.StuChangeType == "01" || entity.StuChangeType == "02" || entity.StuChangeType == "03") //降级、转班、转专业 + if (entity.StuChangeType == "01" || entity.StuChangeType == "07" || entity.StuChangeType == "08") //降级、转班、转专业、 { - //改信息； + //改学籍信息； var classInfoEntity = db.FindEntity(x => x.ClassNo == entity.ClassNo); if (classInfoEntity != null) { db.ExecuteBySql($"update StuInfoBasic set DeptNo='{entity.DeptNo}',MajorNo='{entity.MajorNo}',ClassNo='{entity.ClassNo}',Grade='{classInfoEntity.Grade}' where StuNo='{entity.StuNo}' "); } } - else if (entity.StuChangeType == "04" || entity.StuChangeType == "05") //退学、休学 + else if (entity.StuChangeType == "02" || entity.StuChangeType == "05" || entity.StuChangeType == "06") //转校、退学、休学 { - //改信息；显示成绩； + //改学籍信息（异动状态为null表示显示成绩）； db.ExecuteBySql($"update StuInfoBasic set ChangeStatus=null where StuNo='{entity.StuNo}' "); } + else if (entity.StuChangeType == "03") //复学 + { + //改学籍信息（异动状态为1表示不显示成绩）； + db.ExecuteBySql($"update StuInfoBasic set ChangeStatus=1 where StuNo='{entity.StuNo}' "); + } - //修改状态 + //修改异动表：审批状态、审批人、 db.ExecuteBySql("update StuInfoBasicChange set CheckTime=null,CheckUserId=null,CheckStatus=0 where Id='" + keyValue + "' "); + //删除异动日志表：学籍异动主键id + db.ExecuteBySql("delete from StuInfoBasic_ChangeLog where StuChangeId='" + keyValue + "' "); + } db.Commit(); } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic_ChangeLog/StuInfoBasic_ChangeLogEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic_ChangeLog/StuInfoBasic_ChangeLogEntity.cs index 38d1e0a44..474ad6ed7 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic_ChangeLog/StuInfoBasic_ChangeLogEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic_ChangeLog/StuInfoBasic_ChangeLogEntity.cs @@ -51,6 +51,21 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// [Column("STUID")] public string StuID { get; set; } + /// + /// 学籍异动类型（留级01，转出/校02，复学03，转入/进04，退学05，休学06，转班07，转专业08，学籍关键信息更改09） + /// + [Column("STUCHANGETYPE")] + public string StuChangeType { get; set; } + /// + /// 学籍异动备注 + /// + [Column("STUCHANGEREMARK")] + public string StuChangeRemark { get; set; } + /// + /// StuInfoBasicChange主键 + /// + [Column("STUCHANGEID")] + public string StuChangeId { get; set; } #endregion #region 扩展操作 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic_ChangeLog/StuInfoBasic_ChangeLogService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic_ChangeLog/StuInfoBasic_ChangeLogService.cs index 335ab28f7..e5bfd65be 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic_ChangeLog/StuInfoBasic_ChangeLogService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic_ChangeLog/StuInfoBasic_ChangeLogService.cs @@ -29,16 +29,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration try { var strSql = new StringBuilder(); - strSql.Append("SELECT "); - strSql.Append(@" - t.ID, - t.FieldName, - t.BeforeChange, - t.AfterChange, - t.UpdateBy, - t.UpdateTime, - t.StuID - "); + strSql.Append("SELECT t.*"); strSql.Append(" FROM StuInfoBasic_ChangeLog t "); strSql.Append(" WHERE 1=1 "); var queryParam = queryJson.ToJObject(); @@ -57,7 +48,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } if (!queryParam["StuID"].IsEmpty()) { - dp.Add("StuID", "" + queryParam["StuID"].ToString() + "", DbType.String); + dp.Add("StuID", queryParam["StuID"].ToString(), DbType.String); strSql.Append(" AND t.StuID = @StuID "); } if (!queryParam["UpdateTime"].IsEmpty()) @@ -67,8 +58,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } if (!queryParam["UpdateBy"].IsEmpty()) { - dp.Add("UpdateBy", "%" + queryParam["UpdateBy"].ToString() + "%", DbType.String); - strSql.Append(" AND t.UpdateBy Like @UpdateBy "); + dp.Add("UpdateBy", queryParam["UpdateBy"].ToString(), DbType.String); + strSql.Append(" AND t.UpdateBy = @UpdateBy "); } return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(),dp, pagination); }