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 70567beae..4e68b3588 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 @@ -149,6 +149,19 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers return Success("操作成功！"); } + /// + /// 复学 + /// 主键 + /// + /// + [HttpPost] + [AjaxOnly] + public ActionResult DoGoBack(string keyValue) + { + stuInfoBasicChangeIBLL.DoGoBack(keyValue); + return Success("操作成功！"); + } + #endregion } 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 6dfe0411e..134f5d2ce 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 @@ -15,8 +15,16 @@ var bootstrap = function ($, learun) { page.initData(); }, bind: function () { - $('#StuChangeType').lrDataItemSelect({ - code: 'StuChangeType', select: function (item) { + //$('#StuChangeType').lrDataItemSelect({ + // code: 'StuChangeType', + // select: function (item) { + // console.log(item); + // } + //}); + //异动类型下拉不显示复学、学籍关键信息更改、转入/进、； + $('#StuChangeType').lrselect({ + data: [{ text: '留级', id: '01' }, { text: '转出/校', id: '02' }, { text: '退学', id: '05' }, { text: '休学', id: '06' }, { text: '转班', id: '07' }, { text: '转专业', id: '08' }], + select: function (item) { if (item != null && item != undefined) { var StuNo = $('#StuNo').val(); if (!StuNo) { @@ -59,25 +67,6 @@ var bootstrap = function ($, learun) { $('#OutSchool').attr("checkexpession", "NotNull"); $("#OutSchool").siblings('div').html($("#OutSchool").siblings('div').attr('data-title') + '*'); $(".NewSchool").show(); - } else if (item.id === "03") { //复学 - $("#NewDeptNo").lrselectSet($("#DeptNo").lrselectGet()); - var timer2 = setInterval(function () { - if ($("#NewDeptNo").lrselectGet()) { - $("#NewMajorNo").lrselectSet($("#MajorNo").lrselectGet()); - console.log("系部赋值后，在赋值专业：" + $("#NewMajorNo").lrselectGet()); - clearInterval(timer2); - } - }, 1000); - var timer3 = setInterval(function () { - if ($("#NewMajorNo").lrselectGet()) { - $("#NewClassNo").lrselectSet($("#ClassNo").lrselectGet()); - clearInterval(timer3); - } - }, 1000); - } else if (item.id === "04") { //转入/进 - learun.alert.warning("异动转进请点击学籍信息管理-异动转入按钮！"); - $("#StuNo").val(""); - $("#StuName").val(""); } else if (item.id === "05" || item.id === "06") { //退学、休学、 $(".NewContainer").find('.contentDiv').removeAttr("isvalid"); @@ -213,13 +202,8 @@ var bootstrap = function ($, learun) { $('#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'); - } else if (data[id].StuChangeType == "04") { //转入/进 - learun.alert.warning("异动转进请点击学籍信息管理-异动转入按钮！"); - $("#StuNo").val(""); - $("#StuName").val(""); - } else if (data[id].StuChangeType == "05" || data[id].StuChangeType == "06") { //退学、休学、 + } + 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'); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Index.cshtml index 9a9b8447c..78fe32f4a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Index.cshtml @@ -29,6 +29,9 @@  审核  去审核 +
+  复学 +
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Index.js index 76ceab8f3..823e32372 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuInfoBasicChange/Index.js @@ -99,6 +99,11 @@ var bootstrap = function ($, learun) { learun.alert.warning("当前项目未审核无法去审！"); return; } + var GoBackStatus = $('#gridtable').jfGridValue('GoBackStatus'); + if (GoBackStatus == 1) { + learun.alert.warning("当前休学项已复学,无法去审！"); + return; + } learun.layerConfirm('是否确认去审核该项！', function (res) { if (res) { learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasicChange/UnCheckForm', { keyValue: keyValue }, function () { @@ -108,10 +113,40 @@ var bootstrap = function ($, learun) { }); } }); + + // 复学 + $('#lr_goback').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('Id'); + if (learun.checkrow(keyValue)) { + //对已审核&休学&未复学 + var StuChangeType = $('#gridtable').jfGridValue('StuChangeType'); + if (StuChangeType != "06") { + learun.alert.warning("当前项异动类型不是休学，无法复学！"); + return; + } + var CheckStatus = $('#gridtable').jfGridValue('CheckStatus'); + if (CheckStatus != 1) { + learun.alert.warning("当前休学项未审核，无法复学！"); + return; + } + var GoBackStatus = $('#gridtable').jfGridValue('GoBackStatus'); + if (GoBackStatus == 1) { + learun.alert.warning("当前休学项已复学！"); + return; + } + learun.layerConfirm('是否确认复学该项！', function (res) { + if (res) { + learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasicChange/DoGoBack', { keyValue: keyValue }, function () { + refreshGirdData(); + }); + } + }); + } + }); }, // 初始化列表 initGird: function () { - $('#gridtable').lrAuthorizeJfGrid({ + $('#gridtable').jfGrid({ url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasicChange/GetPageList', headData: [ { label: "学号", name: "StuNo", width: 100, align: "left" }, @@ -230,6 +265,14 @@ var bootstrap = function ($, learun) { return cellvalue == "1" ? "已审核" : "未审核"; } }, + { + label: "复学状态", name: "GoBackStatus", width: 100, align: "left", + formatter: function (cellvalue) { + return cellvalue == "1" ? "已复学" : "未复学"; + } + }, + { label: "复学时间", name: "GoBackTime", width: 150, align: "left" }, + ], mainId: 'Id', isPage: true, diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/StuInfoDropMap.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/StuInfoDropMap.cs new file mode 100644 index 000000000..564dfa6f4 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/EducationalAdministration/StuInfoDropMap.cs @@ -0,0 +1,29 @@ +using Learun.Application.TwoDevelopment.EducationalAdministration; +using System.Data.Entity.ModelConfiguration; + +namespace Learun.Application.Mapping +{ + /// + /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 + /// Copyright (c) 2013-2018 北京泉江科技有限公司 + /// 创 建：超级管理员 + /// 日 期：2022-10-13 16:53 + /// 描 述：学生退学 + /// + public class StuInfoDropMap : EntityTypeConfiguration + { + public StuInfoDropMap() + { + #region 表、主键 + //表 + this.ToTable("STUINFODROP"); + //主键 + this.HasKey(t => t.StuId); + #endregion + + #region 配置关系 + #endregion + } + } +} + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj index 915eb6e3a..b1063e1b3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj @@ -109,6 +109,7 @@ + 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 7141fe0f9..53f6a37f3 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 @@ -1255,32 +1255,13 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration entity.Create(); if (entity.IsTran == "0")//转入/进 { - //学籍异动表 - //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 { StuID = entity.StuId, - BeforeChange = "", - AfterChange = "", - FieldName = "", + BeforeChange = null, + AfterChange = entity.StuId, + FieldName = "学籍表主键", UpdateBy = loginUser.userId, UpdateTime = DateTime.Now, StuChangeType = "04", diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeBLL.cs index 2372848e8..66a0afa6c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeBLL.cs @@ -166,6 +166,30 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } + /// + /// 复学 + /// 主键 + /// + /// + public void DoGoBack(string keyValue) + { + try + { + stuInfoBasicChangeService.DoGoBack(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + #endregion } 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 298b37876..ac951a664 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 @@ -104,6 +104,21 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// [Column("OUTSCHOOL")] public string OutSchool { get; set; } + /// + /// 复学状态（0未复学1已复学） + /// + [Column("GOBACKSTATUS")] + public int? GoBackStatus { get; set; } + /// + /// 复学时间 + /// + [Column("GOBACKTIME")] + public DateTime? GoBackTime { get; set; } + /// + /// 退学表Id + /// + [Column("STUIDINDROP")] + public string StuIdInDrop { get; set; } #endregion #region 扩展操作 diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeIBLL.cs index 0b89d4c67..7cdb8eafc 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeIBLL.cs @@ -58,6 +58,13 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// void DoUnCheck(string keyValue); + /// + /// 复学 + /// 主键 + /// + /// + void DoGoBack(string keyValue); + #endregion } 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 b0b62d8ac..b4747de37 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 @@ -1,4 +1,5 @@ using Dapper; +using Learun.Application.Organization; using Learun.DataBase.Repository; using Learun.Util; using System; @@ -147,15 +148,16 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration public void DoCheck(string keyValue) { var db = this.BaseRepository("CollegeMIS").BeginTrans(); + var dbbase = this.BaseRepository().BeginTrans(); try { var loginUserInfo = LoginUserInfo.Get(); var now = DateTime.Now; var logList = new List(); - var entity = db.FindEntity(x => x.Id == keyValue); + var entity = this.BaseRepository("CollegeMIS").FindEntity(x => x.Id == keyValue); if (entity != null) { - var stuInfoBasicEntity = db.FindEntity(x => x.StuNo == entity.StuNo); + var stuInfoBasicEntity = this.BaseRepository("CollegeMIS").FindEntity(x => x.StuNo == entity.StuNo); if (stuInfoBasicEntity != null) { //处理数据 @@ -207,12 +209,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } else if (entity.StuChangeType == "02" || entity.StuChangeType == "05" || entity.StuChangeType == "06") //转校、退学、休学、 { - //增加异动日志表：学籍异动状态 + //增加异动日志表：学籍id被删除 var logentity = new StuInfoBasic_ChangeLogEntity() { - FieldName = "学籍异动状态", - BeforeChange = stuInfoBasicEntity.ChangeStatus?.ToString(), - AfterChange = "1", + FieldName = "学籍表主键", + BeforeChange = stuInfoBasicEntity.StuId, + AfterChange = null, UpdateBy = loginUserInfo.userId, UpdateTime = now, StuID = stuInfoBasicEntity.StuId, @@ -222,28 +224,19 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration }; 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() + //增加退学表 + db.ExecuteBySql($"insert into StuInfoDrop select * from StuInfoBasic where StuId='{stuInfoBasicEntity.StuId}' "); + //修改异动表：退学表id + entity.StuIdInDrop = stuInfoBasicEntity.StuId; + //删除学籍表 + db.ExecuteBySql($"delete from StuInfoBasic where StuId='{stuInfoBasicEntity.StuId}' "); + //删除账户表 + var userEntity = this.BaseRepository().FindEntity(x => x.F_Account == stuInfoBasicEntity.StuNo); + if (userEntity != null) { - 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}' "); + dbbase.Delete(userEntity); + } + } else if (entity.StuChangeType == "08") //转专业、 { @@ -350,6 +343,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } } + db.Insert(logList); //修改异动表：审批状态、审批人、 @@ -360,10 +354,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } db.Commit(); + dbbase.Commit(); } catch (Exception ex) { db.Rollback(); + dbbase.Rollback(); if (ex is ExceptionEx) { throw; @@ -400,17 +396,16 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } 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($"insert into StuInfoBasic select * from StuInfoDrop where StuId='{entity.StuIdInDrop}' "); + //删除退学表 + db.ExecuteBySql($"delete from StuInfoDrop where StuId='{entity.StuIdInDrop}' "); + //修改异动表：退学表id 为空 + } + //修改异动表：审批状态、审批人、 - db.ExecuteBySql("update StuInfoBasicChange set CheckTime=null,CheckUserId=null,CheckStatus=0 where Id='" + keyValue + "' "); + db.ExecuteBySql($"update StuInfoBasicChange set CheckTime=null,CheckUserId=null,CheckStatus=0,StuIdInDrop=null where Id='" + keyValue + "' "); //删除异动日志表：学籍异动主键id db.ExecuteBySql("delete from StuInfoBasic_ChangeLog where StuChangeId='" + keyValue + "' "); @@ -430,6 +425,71 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } } + + /// + /// 复学 + /// 主键 + /// + /// + public void DoGoBack(string keyValue) + { + var db = this.BaseRepository("CollegeMIS").BeginTrans(); + try + { + var loginUserInfo = LoginUserInfo.Get(); + var now = DateTime.Now; + var logList = new List(); + var entity = this.BaseRepository("CollegeMIS").FindEntity(x => x.Id == keyValue); + if (entity != null) + { + var stuInfoDropEntity = this.BaseRepository("CollegeMIS").FindEntity(x => x.StuId == entity.StuIdInDrop); + if (stuInfoDropEntity != null) + { + //增加异动日志表：学籍id增加 + var logentity = new StuInfoBasic_ChangeLogEntity() + { + FieldName = "学籍表主键", + BeforeChange = null, + AfterChange = stuInfoDropEntity.StuId, + UpdateBy = loginUserInfo.userId, + UpdateTime = now, + StuID = stuInfoDropEntity.StuId, + StuChangeType = "03", + StuChangeRemark = "复学", + StuChangeId = entity.Id + }; + logentity.Create(); + logList.Add(logentity); + //增加学籍表 + db.ExecuteBySql($"insert into StuInfoBasic select * from StuInfoDrop where StuId='{entity.StuIdInDrop}' "); + //删除退学表 + db.ExecuteBySql($"delete from StuInfoDrop where StuId='{entity.StuIdInDrop}' "); + + //修改异动表：复学状态、复学时间、 + entity.GoBackStatus = 1; + entity.GoBackTime = now; + db.Update(entity); + + db.Insert(logList); + + } + } + db.Commit(); + } + catch (Exception ex) + { + db.Rollback(); + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoDrop/StuInfoDropEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoDrop/StuInfoDropEntity.cs new file mode 100644 index 000000000..7f866ccc7 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoDrop/StuInfoDropEntity.cs @@ -0,0 +1,942 @@ +using Learun.Util; +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations.Schema; + +namespace Learun.Application.TwoDevelopment.EducationalAdministration +{ + /// + /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 + /// Copyright (c) 2013-2018 北京泉江科技有限公司 + /// 创 建：超级管理员 + /// 日 期：2022-10-13 16:53 + /// 描 述：学生退学 + /// + public class StuInfoDropEntity + { + #region 实体成员 + + /// + /// 学校编号 + /// + [Column("F_SCHOOLID")] + public string F_SchoolId { get; set; } + + /// + /// 学号 + /// + [Column("STUNO")] + public string StuNo { get; set; } + + /// + /// 学籍号 + /// + [Column("STUCODE")] + public string StuCode { get; set; } + /// + /// 通知书号 + /// + [Column("NOTICENO")] + public string NoticeNo { get; set; } + /// + /// GraduateYear + /// + [Column("GRADUATEYEAR")] + public string GraduateYear { get; set; } + /// + /// 考生号 + /// + [Column("KSH")] + public string ksh { get; set; } + /// + /// 系所代码 + /// + [Column("DEPTNO")] + public string DeptNo { get; set; } + /// + /// 专业代码 + /// + [Column("MAJORNO")] + public string MajorNo { get; set; } + /// + /// 专业方向号（如0，1，2，3，4，5） + ///代表无专业方向细分 + /// + [Column("MAJORDETAILNO")] + public string MajorDetailNo { get; set; } + /// + /// 专业方向名 + /// + [Column("MAJORDETAILNAME")] + public string MajorDetailName { get; set; } + /// + /// 专业拼音全称 + /// + [Column("MAJORDETAILSPELL")] + public string MajorDetailSpell { get; set; } + /// + /// 年级 + /// + [Column("GRADE")] + public string Grade { get; set; } + /// + /// 行政班号 + /// + [Column("CLASSNO")] + public string ClassNo { get; set; } + /// + /// 姓名 + /// + [Column("STUNAME")] + public string StuName { get; set; } + /// + /// 拼音全称 + /// + [Column("SPELLFULL")] + public string SpellFull { get; set; } + /// + /// 拼音简称 + /// + [Column("SPELLBRIEF")] + public string SpellBrief { get; set; } + /// + /// 性别码 + /// + [Column("GENDERNO")] + public bool? GenderNo { get; set; } + /// + /// 出生日期 + /// + [Column("BIRTHDAY")] + public DateTime? Birthday { get; set; } + /// + /// 政治面貌码 + /// + [Column("PARTYFACENO")] + public string PartyFaceNo { get; set; } + /// + /// 家庭出身份 + /// + [Column("FAMILYORIGINNO")] + public string FamilyOriginNo { get; set; } + /// + /// 民族码 + /// + [Column("NATIONALITYNO")] + public string NationalityNo { get; set; } + /// + /// 籍贯省代码 废除 + /// + [Column("PROVINCENO")] + public string ProvinceNo { get; set; } + /// + /// 籍贯省代码代码 + /// + [Column("F_PROVINCEID")] + public string F_ProvinceId { get; set; } + /// + /// 籍贯市代码 + /// + [Column("F_CITYID")] + public string F_CityId { get; set; } + + /// + /// 籍贯县代码 + /// + [Column("F_COUNTYID")] + public string F_CountyId { get; set; } + /// + /// 籍贯 + /// + [Column("REGIONNO")] + public string RegionNo { get; set; } + /// + /// 农业户口（是否农户） + /// + [Column("RESIDENCENO")] + public string ResidenceNo { get; set; } + /// + /// 考生类别 + /// + [Column("TESTSTUSORTNO")] + public string TestStuSortNo { get; set; } + /// + /// 健康状况 + /// + [Column("HEALTHSTATUSNO")] + public string HealthStatusNo { get; set; } + /// + /// 第几志愿 + /// + [Column("WILLNO")] + public string WillNo { get; set; } + /// + /// TestStuSubjectNo + /// + [Column("TESTSTUSUBJECTNO")] + public string TestStuSubjectNo { get; set; } + /// + /// 本专科 + /// + [Column("GRADUATENO")] + public string GraduateNo { get; set; } + /// + /// 计划形式 + /// + [Column("PLANFORMNO")] + public string PlanFormNo { get; set; } + /// + /// 三好 + /// + [Column("ISTHREEGOOD")] + public string IsThreeGood { get; set; } + /// + /// 优干 + /// + [Column("ISEXCELLENT")] + public string IsExcellent { get; set; } + /// + /// 一般学生干部 + /// + [Column("ISNORMALCADRE")] + public string IsNormalCadre { get; set; } + /// + /// 省市前三 + /// + [Column("ISPROVINCEFIRSTTHREE")] + public string IsProvinceFirstThree { get; set; } + /// + /// 港澳台侨 + /// + [Column("OVERSEASCHINESENO")] + public string OverseasChineseNo { get; set; } + /// + /// 录取类别 + /// + [Column("MATRICULATESORT")] + public string MatriculateSort { get; set; } + /// + /// 来源地区码 + /// + [Column("COMEPROVINCENO")] + public string ComeProvinceNo { get; set; } + /// + /// 原单位码 + /// + [Column("HIGHSCHOOLNO")] + public string HighSchoolNo { get; set; } + /// + /// 原单位 + /// + [Column("HIGHSCHOOLNAME")] + public string HighSchoolName { get; set; } + /// + /// 入学年月 + /// + [Column("ENTRANCEDATE")] + public DateTime? EntranceDate { get; set; } + /// + /// 宗教 + /// + [Column("RELIGION")] + public string Religion { get; set; } + /// + /// 特长 + /// + [Column("GOODAT")] + public string GoodAt { get; set; } + /// + /// 身份证号 + /// + [Column("IDENTITYCARDNO")] + public string IdentityCardNo { get; set; } + /// + /// 入党时间 + /// + [Column("JOINPARTYDATE")] + public DateTime? JoinPartyDate { get; set; } + /// + /// 入团时间 + ///团员league + /// + [Column("JOINLEAGUEDATE")] + public DateTime? JoinLeagueDate { get; set; } + /// + /// 校内地址 + /// + [Column("INSCHOOLADDRESS")] + public string InSchoolAddress { get; set; } + /// + /// 校内电话 + /// + [Column("INSCHOOLTELEPHONE")] + public string InSchoolTelephone { get; set; } + /// + /// 当前异动类别 + /// + [Column("ABMORMITYMOVEMARK")] + public string AbmormityMoveMark { get; set; } + /// + /// 奖励标志 + /// + [Column("AWARDMARK")] + public string AwardMark { get; set; } + /// + /// 处分标志 + /// + [Column("PUNISHMARK")] + public string PunishMark { get; set; } + /// + /// 联系人标志 + /// + [Column("LINKMANMARK")] + public string LinkmanMark { get; set; } + /// + /// 学号异动标志 + /// + [Column("STUNOCHANGEMARK")] + public string StuNoChangeMark { get; set; } + /// + /// 毕业标志（0待准许，1准许毕业，2已毕业，） + /// + [Column("FINISHSCHOOLMARK")] + public string FinishSchoolMark { get; set; } + /// + /// 当前注册标志 + /// + [Column("CURRENTREGISTERMARK")] + public string CurrentRegisterMark { get; set; } + /// + /// 毕业年月 + /// + [Column("FINISHSCHOOLDATE")] + public DateTime? FinishSchoolDate { get; set; } + /// + /// 毕业证书号 + /// + [Column("DIPLOMANO")] + public string DiplomaNo { get; set; } + /// + /// 毕业证书备注 + /// + [Column("DIPLOMAREMARK")] + public string DiplomaRemark { get; set; } + /// + /// 备注 + /// + [Column("REMARK")] + public string Remark { get; set; } + /// + /// 报到日期 + /// + [Column("REGISTERDATE")] + public DateTime? RegisterDate { get; set; } + /// + /// Photo + /// + [Column("PHOTO")] + public string Photo { get; set; } + /// + /// TeachPlanNo + /// + [Column("TEACHPLANNO")] + public string TeachPlanNo { get; set; } + /// + /// 审查标志 + /// + [Column("CHECKMARK")] + public string CheckMark { get; set; } + /// + /// 联系电话（手机） + /// + [Column("MOBILE")] + public string mobile { get; set; } + /// + /// 电子邮件地址 + /// + [Column("EMAIL")] + public string EMail { get; set; } + /// + ///QQ + /// + [Column("QQ")] + public string QQ { get; set; } + /// + /// 户口所在地 + /// + [Column("FATHERUNIT")] + public string FatherUnit { get; set; } + /// + /// 父亲姓名 + /// + [Column("FATHERNAME")] + public string FatherName { get; set; } + /// + /// 父亲电话 + /// + [Column("FATHERPHONE")] + public string FatherPhone { get; set; } + /// + /// 母亲姓名 + /// + [Column("MATHERNAME")] + public string MatherName { get; set; } + /// + /// 档案所在地 + /// + [Column("MATHERUNIT")] + public string MatherUnit { get; set; } + /// + /// 母亲电话 + /// + [Column("MATHERPHONE")] + public string MatherPhone { get; set; } + /// + /// 用户名 + /// + [Column("USERNAME")] + public string username { get; set; } + /// + /// 密码 + /// + [Column("PASSWORD")] + public string password { get; set; } + /// + /// MailAddress收件人名址（收件人地址+ 姓名,可置默认值为家庭地址） + /// + [Column("MAILADDRESS")] + public string MailAddress { get; set; } + /// + /// PostalCode邮政编码 + /// + [Column("POSTALCODE")] + public string PostalCode { get; set; } + /// + /// InSchoolStatus + /// + [Column("INSCHOOLSTATUS")] + public string InSchoolStatus { get; set; } + /// + /// TransMark + /// + [Column("TRANSMARK")] + public string TransMark { get; set; } + /// + /// ClassTutorNo + /// + [Column("CLASSTUTORNO")] + public string ClassTutorNo { get; set; } + /// + /// 学籍卡审核 + /// + [Column("RESUMECHECK")] + public string ResumeCheck { get; set; } + /// + /// PracStatus + /// + [Column("PRACSTATUS")] + public string PracStatus { get; set; } + /// + /// RegisterStatus + /// + [Column("REGISTERSTATUS")] + public int? RegisterStatus { get; set; } + /// + /// PunishmentDate + /// + [Column("PUNISHMENTDATE")] + public DateTime? PunishmentDate { get; set; } + /// + /// StuId + /// + [Column("STUID")] + public string StuId { get; set; } + + /// + /// 学制 + /// + [Column("EDUSYSTEM")] + public string EduSystem { get; set; } + + /// + /// 学习形式 + /// + [Column("STUDYMODALITY")] + public string StudyModality { get; set; } + /// + /// 学籍异动状态（1表示不显示成绩） + /// + /// + [Column("CHANGESTATUS")] + public int? ChangeStatus { get; set; } + /// + /// SyncFlag + /// + [Column("SYNCFLAG")] + public bool? SyncFlag { get; set; } + + /// + /// 余额 + /// + [Column("BALANCE")] + public string Balance { get; set; } + + /// + /// 身体健康状况 + /// + [Column("HEALTHSTATUS")] + public string HealthStatus { get; set; } + + + /// + /// 身份证件类型 + /// + [Column("IDCARDTYPE")] + public string IdCardType { get; set; } + /// + /// 入学方式 + /// + [Column("ENTRANCEWAY")] + public string EntranceWay { get; set; } + /// + /// 就读方式 + /// + [Column("STUDYINGWAY")] + public string StudyingWay { get; set; } + /// + /// 国籍/地区 + /// + [Column("COUNTRYNO")] + public string CountryNo { get; set; } + /// + /// 婚姻状况 + /// + [Column("MARRIAGESTATUS")] + public string MarriageStatus { get; set; } + /// + /// 乘火车区间 + /// + [Column("TRAININTERVAL")] + public string TrainInterval { get; set; } + /// + /// 是否随迁子女 + /// + [Column("ISTRAILCHILDREN")] + public string IsTrailChildren { get; set; } + /// + /// 生源地行政区划码 + /// + [Column("STUPLACECODE")] + public string StuPlaceCode { get; set; } + /// + /// 出生地行政区划码 + /// + [Column("BIRTHPLACECODE")] + public string BirthPlaceCode { get; set; } + /// + /// 籍贯地行政区划码 + /// + [Column("NATIVEPLACECODE")] + public string NativePlaceCode { get; set; } + /// + /// 户口所在地行政区划码 + /// + [Column("RESIDENCEPLACECODE")] + public string ResidencePlaceCode { get; set; } + /// + /// 所属派出所 + /// + [Column("BELONGPOLICE")] + public string BelongPolice { get; set; } + /// + /// 学生居住地类型 + /// + [Column("STULIVEPLACETYPE")] + public string StuLivePlaceType { get; set; } + /// + /// 学生来源 + /// + [Column("STUORIGIN")] + public string StuOrigin { get; set; } + /// + /// 招生对象 + /// + [Column("RECRUITOBJECT")] + public string RecruitObject { get; set; } + /// + /// 贫困户否建档立卡贫困户 + /// + [Column("POORISRECORD")] + public string PoorIsRecord { get; set; } + /// + /// 招生方式 + /// + [Column("RECRUITWAY")] + public string RecruitWay { get; set; } + /// + /// 联招合作类型 + /// + [Column("RECRUITCOOPERATETYPE")] + public string RecruitCooperateType { get; set; } + /// + /// 准考证号 + /// + [Column("ADMISSIONNO")] + public string AdmissionNo { get; set; } + /// + /// 考试总分 + /// + [Column("EXAMSCORE")] + public decimal? ExamScore { get; set; } + /// + /// 联招合作办学形式 + /// + [Column("RECRUITCOOPERATEFORM")] + public string RecruitCooperateForm { get; set; } + /// + /// 联招合作学校代码 + /// + [Column("RECRUITCOOPERATESCHOOLNO")] + public string RecruitCooperateSchoolNo { get; set; } + /// + /// 校外教学点 + /// + [Column("SCHOOLOUTSIDEPLACE")] + public string SchoolOutsidePlace { get; set; } + /// + /// 分段培养方式 + /// + [Column("PIECECULTIVATEWAY")] + public string PieceCultivateWay { get; set; } + /// + /// 英文姓名 + /// + [Column("ENGLISHNAME")] + public string EnglishName { get; set; } + /// + /// 成员1关系 + /// + [Column("ONEMEMBERSHIP")] + public string OneMembership { get; set; } + /// + /// 成员1是否监护人 + /// + [Column("ONEISGUARDIAN")] + public string OneIsGuardian { get; set; } + /// + /// 成员1出生年月 + /// + [Column("ONEBIRTHDAY")] + public string OneBirthday { get; set; } + /// + /// 成员1身份证件类型 + /// + [Column("ONEIDCARDTYPE")] + public string OneIdCardType { get; set; } + /// + /// 成员1身份证件号 + /// + [Column("ONEIDCARDNO")] + public string OneIdCardNo { get; set; } + /// + /// 成员1民族 + /// + [Column("ONENATIONALITYNO")] + public string OneNationalityNo { get; set; } + /// + /// 成员1政治面貌 + /// + [Column("ONEPARTYFACENO")] + public string OnePartyFaceNo { get; set; } + /// + /// 成员1健康状况 + /// + [Column("ONEHEALTHSTATUS")] + public string OneHealthStatus { get; set; } + /// + /// 成员1工作或学习单位 + /// + [Column("ONEJOB")] + public string OneJob { get; set; } + /// + /// 成员1职务 + /// + [Column("ONEPOSITION")] + public string OnePosition { get; set; } + /// + /// 成员2关系 + /// + [Column("TWOMEMBERSHIP")] + public string TwoMembership { get; set; } + /// + /// 成员2是否监护人 + /// + [Column("TWOISGUARDIAN")] + public string TwoIsGuardian { get; set; } + /// + /// 成员2出生年月 + /// + [Column("TWOBIRTHDAY")] + public string TwoBirthday { get; set; } + /// + /// 成员2身份证件类型 + /// + [Column("TWOIDCARDTYPE")] + public string TwoIdCardType { get; set; } + /// + /// 成员2身份证件号 + /// + [Column("TWOIDCARDNO")] + public string TwoIdCardNo { get; set; } + /// + /// 成员2民族 + /// + [Column("TWONATIONALITYNO")] + public string TwoNationalityNo { get; set; } + /// + /// 成员2政治面貌 + /// + [Column("TWOPARTYFACENO")] + public string TwoPartyFaceNo { get; set; } + /// + /// 成员2健康状况 + /// + [Column("TWOHEALTHSTATUS")] + public string TwoHealthStatus { get; set; } + /// + /// 成员2工作或学习单位 + /// + [Column("TWOJOB")] + public string TwoJob { get; set; } + /// + /// 成员2职务 + /// + [Column("TWOPOSITION")] + public string TwoPosition { get; set; } + /// + /// 学号 + /// + [Column("PROVINCECODE")] + public string ProvinceCode { get; set; } + /// + /// 监护人 + /// + [Column("GUARDIAN")] + public string Guardian { get; set; } + /// + /// 监护人电话 + /// + [Column("GUARDIANPHONE")] + public string GuardianPhone { get; set; } + /// + /// 监护人与被监护人的关系 + /// + [Column("GUARDIANTYPE")] + public string GuardianType { get; set; } + /// + /// 单亲 + /// + [Column("ISSINGLE")] + public bool? IsSingle { get; set; } + /// + /// 留守 + /// + [Column("ISLEFT")] + public bool? IsLeft { get; set; } + /// + /// 残疾 + /// + [Column("ISDISABILITY")] + public bool? IsDisability { get; set; } + /// + /// 走读 + /// + [Column("ISRUNSCHOOL")] + public bool? IsRunSchool { get; set; } + /// + /// 困难 + /// + [Column("ISDDIFFICULTY")] + public bool? IsDdifficulty { get; set; } + /// + /// 五年一贯制 + /// + [Column("FiveYear")] + public string FiveYear { get; set; } + /// + /// 实习状态 + /// + [Column("INTERNSHIPSTATUS")] + public string InternshipStatus { get; set; } + /// + /// 是否复读 + /// + [Column("ISRESTUDY")] + public string IsRestudy { get; set; } + + /// + /// 成员1名称 + /// + [Column("OneName")] + public string OneName { get; set; } + /// + /// 成员2名称 + /// + [Column("TWONAME")] + public string TwoName { get; set; } + /// + /// 其他联系方式 + /// + [Column("OTHERCONTACT")] + public string OtherContact { get; set; } + /// + /// 成员1联系方式 + /// + [Column("ONEMOBILE")] + public string OneMobile { get; set; } + /// + /// 成员2联系方式 + /// + [Column("TWOMOBILE")] + public string TwoMobile { get; set; } + + /// + /// 图书资料归还状态 + /// + /// + [Column("RETURNBOOKSSTATUS")] + public string ReturnBooksStatus { get; set; } + /// + /// 图书资料归还时间 + /// + /// + [Column("RETURNBOOKSDATE")] + public DateTime? ReturnBooksDate { get; set; } + /// + /// 就业协议备案状态 + /// + /// + [Column("EMPLOYAGREESTATUS")] + public string EmployAgreeStatus { get; set; } + /// + /// 就业协议备案时间 + /// + /// + [Column("EMPLOYAGREEDATE")] + public DateTime? EmployAgreeDate { get; set; } + /// + /// 学杂费结算状态 + /// + /// + [Column("FEESETTLESTATUS")] + public string FeeSettleStatus { get; set; } + /// + /// 学杂费结算时间 + /// + /// + [Column("FEESETTLEDATE")] + public DateTime? FeeSettleDate { get; set; } + /// + /// 办理退住手续状态 + /// + /// + [Column("CHECKOUTSTATUS")] + public string CheckOutStatus { get; set; } + /// + /// 办理退住手续时间 + /// + /// + [Column("CHECKOUTDATE")] + public DateTime? CheckOutDate { get; set; } + /// + /// 校园卡注销状态 + /// + /// + [Column("CARDDEREGISTRATESTATUS")] + public string CardDeregistrateStatus { get; set; } + /// + /// 校园卡注销时间 + /// + /// + [Column("CARDDEREGISTRATEDATE")] + public DateTime? CardDeregistrateDate { get; set; } + /// + /// 毕业证领取状态 + /// + /// + [Column("DIPLOMARECEIVESTATUS")] + public string DiplomaReceiveStatus { get; set; } + /// + /// 毕业证领取时间 + /// + /// + [Column("DIPLOMARECEIVEDATE")] + public DateTime? DiplomaReceiveDate { get; set; } + /// + /// 档案关系转出状态 + /// + /// + [Column("FILETRANSFERSTATUS")] + public string FileTransferStatus { get; set; } + /// + /// 档案关系转出状态时间 + /// + /// + [Column("FILETRANSFERDATE")] + public DateTime? FileTransferDate { get; set; } + /// + /// 组织关系转出状态 + /// + /// + [Column("TISSUESTATUS")] + public string TissueStatus { get; set; } + /// + /// 组织关系转出状态时间 + /// + /// + [Column("TISSUEDATE")] + public DateTime? TissueDate { get; set; } + /// + /// 毕业证领取-领取人签名 + /// + /// + [Column("DIPLOMARECEIVESIGN")] + public string DiplomaReceiveSign { get; set; } + /// + /// 毕业证领取-代领人身份证号 + /// + /// + [Column("DIPLOMARECEIVEIDCARD")] + public string DiplomaReceiveIdcard { get; set; } + /// + /// 毕业证领取-代领备注 + /// + /// + [Column("DIPLOMARECEIVEREMARK")] + public string DiplomaReceiveRemark { get; set; } + #endregion + + #region 扩展操作 + /// + /// 新增调用 + /// + public void Create() + { + this.StuId = Guid.NewGuid().ToString(); + } + /// + /// 编辑调用 + /// + /// + public void Modify(string keyValue) + { + this.StuId = keyValue; + } + #endregion + #region 扩展字段 + + #endregion + + } +} + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj index 38123e9b6..685fa64e5 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj @@ -273,6 +273,7 @@ +