From d3795c9d3205799d03a5cc2313c1632a331387b1 Mon Sep 17 00:00:00 2001 From: edy Date: Wed, 7 Jul 2021 11:45:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E6=9F=A5=E9=98=85?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=20=E6=89=93=E5=8D=B0=E6=9F=A5=E9=98=85?= =?UTF-8?q?=E4=BA=BA=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/DispatchController.cs | 26 ++++++++++++------- .../Views/Dispatch/Index.js | 4 +-- .../Views/Dispatch/IndexXF.js | 4 +-- .../DispatchAudit/DispatchAuditIBLL.cs | 2 +- 4 files changed, 22 insertions(+), 14 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/DispatchController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/DispatchController.cs index a580ef732..ddca4fc31 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/DispatchController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/DispatchController.cs @@ -237,10 +237,10 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers //获取校长的签名盖章 批示+时间+阅 var listTaskLog = nWFTaskIBLL.GetLogList(dispatchEntity.processId); var PrintList = nWFTaskIBLL.GetLogList(dispatchEntity.processId).OrderBy(o => o.F_CreateDate).ToList(); - var Auditlist = dispatchAuditIBLL.Readlist(keyValue); - if (listTaskLog.Count() > 0) + var Auditlist = dispatchAuditIBLL.ReadList(keyValue); + if (PrintList.Count > 0) { - for (int i = 0; i < PrintList.Count; i++) + for (int i = 1; i < PrintList.Count; i++) { if (i == 1) { @@ -255,7 +255,6 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers { for (int i = 0; i < Auditlist.Count; i++) { - dispatchEntity.Listarray += Auditlist[i].AuditUser + Auditlist[i].AuditTime + "阅" + "&"; } } @@ -284,11 +283,20 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers } else { - entityaudit.DisId = keyValue; - entityaudit.AuditTime = DateTime.Now; - entityaudit.AuditUser = userInfo.realName; - dispatchAuditIBLL.SaveEntity("", entityaudit); - return Success("阅读成功！"); + var dispatchEntity = dispatchIBLL.GetDispatchEntity(keyValue); + var PrintList = nWFTaskIBLL.GetLogList(dispatchEntity.processId).Select(x => x.F_CreateUserName); + if (PrintList.Contains(userInfo.realName)) + { + return Fail("请勿重复批阅！"); + } + else + { + entityaudit.DisId = keyValue; + entityaudit.AuditTime = DateTime.Now; + entityaudit.AuditUser = userInfo.realName; + dispatchAuditIBLL.SaveEntity("", entityaudit); + return Success("查阅完成！"); + } } } #endregion diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/Index.js index 6b20025c4..14242836d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/Index.js @@ -220,8 +220,8 @@ var bootstrap = function ($, learun) { if (res.code == 200) { // 发起流程 var postData = { - schemeCode: 'Dispatch',// 填写流程对应模板编号 - //schemeCode: 'DBSW',// 填写流程对应模板编号 + //schemeCode: 'Dispatch',// 本地 + schemeCode: 'DBSW',//线上 processId: processId, level: '1', }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/IndexXF.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/IndexXF.js index 08f48ddfd..b3f8a563e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/IndexXF.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Dispatch/IndexXF.js @@ -221,8 +221,8 @@ var bootstrap = function ($, learun) { if (res.code == 200) { // 发起流程 var postData = { - schemeCode: 'Dispatch',// 填写流程对应模板编号 - //schemeCode: 'XBSW',// 填写流程对应模板编号 + //schemeCode: 'Dispatch',// 本地 + schemeCode: 'XBSW',// 线上 processId: processId, level: '1', }; diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/DispatchAudit/DispatchAuditIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/DispatchAudit/DispatchAuditIBLL.cs index b9979bbb7..9ccf436a6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/DispatchAudit/DispatchAuditIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/DispatchAudit/DispatchAuditIBLL.cs @@ -63,7 +63,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration /// /// /// - List Readlist(string DisId); + List ReadList(string DisId); } }