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 dcf285011..952067fec 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 @@ -47,24 +47,6 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { return View(); } - /// - /// 表单查看页 - /// - /// - [HttpGet] - public ActionResult Formbefore() - { - return View(); - } - /// - /// 表单查看页 - /// - /// - [HttpGet] - public ActionResult Formafter() - { - return View(); - } #endregion #region 获取数据 @@ -140,7 +122,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers stuInfoBasicChangeIBLL.SaveEntity(keyValue, entity); return Success("保存成功!"); } - + /// /// 审核实体数据 /// 主键 @@ -167,20 +149,6 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers return Success("操作成功!"); } - /// - /// 生成学籍 - /// 主键 - /// - /// - [HttpPost] - [AjaxOnly] - - public ActionResult GenerateStu(string stuNo) - { - stuInfoBasicChangeIBLL.GenerateStu(stuNo); - return Success("生成成功!"); - } - #endregion } 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 d2f7a5b15..ea287be9c 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 @@ -26,7 +26,7 @@
-
学籍原安排
+
学籍异动前信息
系部*
@@ -46,7 +46,7 @@
-
学籍新安排
+
学籍异动后信息
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 e7bb6daec..bca4b9019 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 @@ -108,60 +108,6 @@ var bootstrap = function ($, learun) { }); } }); - // 异动前学籍信息 - $('#lr_before').on('click', function () { - var keyValue = $('#gridtable').jfGridValue('Id'); - learun.layerForm({ - id: 'form', - title: '异动前学籍信息', - url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasicChange/Formbefore?keyValue=' + keyValue, - width: 800, - height: 400, - callBack: function (id) { - return top[id].acceptClick(refreshGirdData); - }, - btn: null - }); - }); - // 异动后学籍信息 - $('#lr_after').on('click', function () { - var keyValue = $('#gridtable').jfGridValue('Id'); - if (learun.checkrow(keyValue)) { - learun.layerForm({ - id: 'form', - title: '异动前学籍信息', - url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasicChange/Formafter?keyValue=' + keyValue, - width: 800, - height: 400, - callBack: function (id) { - return top[id].acceptClick(refreshGirdData); - }, - btn: null - }); - } - }); - $('#lr_stuCode').on('click', function () { - var StuNo = $('#gridtable').jfGridValue('StuNo'); - if (learun.checkrow(StuNo)) { - var CheckStatus = $('#gridtable').jfGridValue('CheckStatus'); - if (CheckStatus != 1) { - learun.alert.warning("当前项目未审核无法去审!"); - return; - } - var StuChangeType = $('#gridtable').jfGridValue('StuChangeType'); - if (StuChangeType != "02") { - learun.alert.warning("只有转入学生才可生成学籍!"); - return; - } - learun.layerConfirm('是否确认生成学籍!', function (res) { - if (res) { - learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasicChange/GenerateStu', { stuNo: StuNo }, function () { - refreshGirdData(); - }); - } - }); - } - }); }, // 初始化列表 initGird: function () { 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 ec5b613a4..7ff4fcd7a 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 @@ -101,15 +101,29 @@ var bootstrap = function ($, learun) { $('#gridtable').lrAuthorizeJfGrid({ url: top.$.rootUrl + '/EducationalAdministration/StuInfoBasic_ChangeLog/GetPageList', headData: [ + { label: "修改属性", name: "FieldName", width: 200, align: "left" }, + { label: "修改前", name: "BeforeChange", width: 200, align: "left" }, + { label: "修改后", name: "AfterChange", width: 200, align: "left" }, + { + label: "修改人", name: "UpdateBy", width: 200, align: "left", + formatterAsync: function (callback, value, row, op, $cell) { + learun.clientdata.getAsync('custmerData', { + url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'BaseUser', + key: value, + keyId: 'f_account', + callback: function (_data) { + callback(_data['f_realname']); + } + }); + } + + }, + { label: "修改时间", name: "UpdateTime", width: 200, align: "left" }, { label: "数据主键", name: "StuID", width: 250, align: "left" }, - { label: "字段", name: "FieldName", width: 100, align: "left" }, - { label: "修改前", name: "BeforeChange", width: 100, align: "left" }, - { label: "修改后", name: "AfterChange", width: 100, align: "left" }, - { label: "修改人", name: "UpdateBy", width: 100, align: "left" }, - { label: "修改时间", name: "UpdateTime", width: 100, align: "left" }, ], mainId: 'ID', - isPage: true + isPage: true, + sidx: 'UpdateTime desc', }); page.search(); }, 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 a3adf6926..75b9fc77e 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 @@ -1078,8 +1078,6 @@ - - @@ -7553,8 +7551,6 @@ - - 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 ea78f808d..2372848e8 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,29 +166,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } - /// - /// 生成学籍 - /// 主键 - /// - /// - public void GenerateStu(string stuNo) - { - try - { - stuInfoBasicChangeService.GenerateStu(stuNo); - } - 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/StuInfoBasicChangeIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasicChange/StuInfoBasicChangeIBLL.cs index 7935e6ff0..0b89d4c67 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 @@ -57,11 +57,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// /// void DoUnCheck(string keyValue); - /// - /// 生成学籍 - /// - /// - void GenerateStu(string stuNo); #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 739d03722..17f8e9173 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 @@ -237,28 +237,6 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } } } - - public void GenerateStu(string stuNo) - { - try - { - var entity = this.BaseRepository("CollegeMIS").FindEntity(s => s.StuNo == stuNo); - entity.StuCode = "G" + entity.IdentityCardNo; - this.BaseRepository("CollegeMIS").Update(entity); - } - catch (Exception ex) - { - if (ex is ExceptionEx) - { - throw; - } - else - { - throw ExceptionEx.ThrowServiceException(ex); - } - } - } - #endregion }