From c42158f5dc2c5848faa6bf8a77428041b0c0bce6 Mon Sep 17 00:00:00 2001 From: dyy <18335927079@163.com> Date: Wed, 9 Jun 2021 10:46:53 +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=E6=81=A2=E5=A4=8D=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/StuInfoBasicChange/Index.cshtml | 2 +- .../Views/StuInfoBasicChange/Index.js | 8 ++++---- .../StuInfoBasicChange/StuInfoBasicChangeEntity.cs | 2 +- .../StuInfoBasicChange/StuInfoBasicChangeService.cs | 6 +++++- 4 files changed, 11 insertions(+), 7 deletions(-) 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..50ffc6acc 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 @@ -27,7 +27,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 1334b21eb..b499cf72c 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 @@ -90,16 +90,16 @@ var bootstrap = function ($, learun) { }); } }); - //去审核 + //去审核/异动恢复 $('#lr_uncheck').on('click', function () { var keyValue = $('#gridtable').jfGridValue('Id'); if (learun.checkrow(keyValue)) { var CheckStatus = $('#gridtable').jfGridValue('CheckStatus'); if (CheckStatus != 1) { - learun.alert.warning("当前项目未审核无法去审！"); + learun.alert.warning("当前项目未审核无法恢复！"); return; } - learun.layerConfirm('是否确认去审核该项！', function (res) { + learun.layerConfirm('是否确认恢复该项！', function (res) { if (res) { learun.postForm(top.$.rootUrl + '/EducationalAdministration/StuInfoBasicChange/UnCheckForm', { keyValue: keyValue }, function () { refreshGirdData(); @@ -225,7 +225,7 @@ var bootstrap = function ($, learun) { { label: "审核状态", name: "CheckStatus", width: 100, align: "left", formatter: function (cellvalue) { - return cellvalue == "1" ? "已审核" : "未审核"; + return cellvalue == "1" ? "已审核" : cellvalue == "2" ? "已恢复" : "未审核"; } }, ], 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 4e04ce9f7..9211fda18 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 @@ -95,7 +95,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration [Column("CHECKUSERID")] public string CheckUserId { get; set; } /// - /// 审核状态：0未审核，1已审核 + /// 审核状态：0未审核，1已审核，2已恢复 /// [Column("CHECKSTATUS")] public int? CheckStatus { 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 5fb126220..e45debea3 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 @@ -220,7 +220,11 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration } //修改状态 - 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 where Id='" + keyValue + "' "); + entity.CheckTime = DateTime.Now; + entity.CheckUserId = LoginUserInfo.Get().account; + entity.CheckStatus = 2; + db.Update(entity); } db.Commit(); }