From 722f55910a41208c61423f493c17a0725104e699 Mon Sep 17 00:00:00 2001 From: wyw <571921741@qq.com> Date: Mon, 5 Feb 2024 17:07:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Api/BSRiskSubmitController.cs | 17 ++++++++++------- .../Controllers/Api/BSSafeCheckController.cs | 5 ++++- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSRiskSubmitController.cs b/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSRiskSubmitController.cs index cbd28e6..e8e4ddd 100644 --- a/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSRiskSubmitController.cs +++ b/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSRiskSubmitController.cs @@ -2780,7 +2780,7 @@ namespace APT.BS.WebApi.Controllers.Api DateTime dtEndTime = NotificationTaskService.GetTaskEndTime(FMTASKTYPE.BS_RiskUp_Deal_Check, entity.ORG_ID.Value, DateTime.Now, null, content.LastDateUser); - notice = NotificationTaskService.InsertUserNoticeTaskModel("隐患整改记录：" + entity.NAME, entity.ID, entity.ORG_ID, entity.DEAL_USER_ID.Value, userDealName, DateTime.Now, dtEndTime, (int)FMNoticeTypeEnum.消息, "BS044_CHECK"); + notice = NotificationTaskService.InsertUserNoticeTaskModel("责任人确认整改：" + entity.NAME, entity.ID, entity.ORG_ID, entity.DEAL_USER_ID.Value, userDealName, DateTime.Now, dtEndTime, (int)FMNoticeTypeEnum.消息, "BS044_CHECK"); T_FM_NOTIFICATION_TASK task = null; GetEntityTask(entity.TaskID, ref task, "BS044_SHOWPRINT"); @@ -3359,12 +3359,12 @@ namespace APT.BS.WebApi.Controllers.Api //验收人验收 通过 发起审批流 //不通过 返给 整改落实人 - var sysFilter = new SystemCodeFilter(); - sysFilter.CodeType = (int)PFCodeRuleType.审批流编码; - sysFilter.Count = 2; - sysFilter.OrgId = filter.OrgId; + //var sysFilter = new SystemCodeFilter(); + //sysFilter.CodeType = (int)PFCodeRuleType.审批流编码; + //sysFilter.Count = 2; + //sysFilter.OrgId = filter.OrgId; //var serialCode = CodeRuleService.NewGenSerial(sysFilter); - List listCode = CodeRuleService.NewGenSerial(sysFilter).Split(',').ToList(); + //List listCode = CodeRuleService.NewGenSerial(sysFilter).Split(',').ToList(); return SafeExecute(() => { int DEALSITUATION = 0; @@ -3444,7 +3444,7 @@ namespace APT.BS.WebApi.Controllers.Api entity.ISDEALSIGN = true; entity.DATETIME_DEALSIGN = DateTime.Now; DateTime dtEnd = NotificationTaskService.GetTaskEndTime(FMTASKTYPE.BS_RiskUp_Checker_Check, entity.ORG_ID.Value, DateTime.Now, null, content.LastDateUser); - var notice = NotificationTaskService.InsertUserNoticeTaskModel("隐患整改验收单：" + entity.NAME, entity.ID, entity.ORG_ID, entity.CHECK_USER_ID.Value, entity.Nav_UserCheck.NAME, DateTime.Now, dtEnd, (int)FMNoticeTypeEnum.消息, "BS044_CHECK"); + var notice = NotificationTaskService.InsertUserNoticeTaskModel("验收人确认整改：" + entity.NAME, entity.ID, entity.ORG_ID, entity.CHECK_USER_ID.Value, entity.Nav_UserCheck.NAME, DateTime.Now, dtEnd, (int)FMNoticeTypeEnum.消息, "BS044_CHECK"); this.UnifiedCommit(() => { @@ -3494,6 +3494,9 @@ namespace APT.BS.WebApi.Controllers.Api entity.Nav_Submit = this.GetEntity(entity.RISK_SUBMIT_ID.Value); } + var code = DateTime.Now.ToString("yyyyMMddHHmm"); + List listCode = new List() { code + "1", code + "2" }; + //审批流 MFlowPermitService.InsertApprove(listCode[0], "BS043", parms, entity.ID, "BS044_SHOWPRINT", TaskID, true, () => { diff --git a/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSSafeCheckController.cs b/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSSafeCheckController.cs index 11374e0..b7c65e6 100644 --- a/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSSafeCheckController.cs +++ b/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSSafeCheckController.cs @@ -2997,7 +2997,10 @@ namespace APT.BS.WebApi.Controllers.Api } if (item.CHECKRESULT.HasValue && item.CHECKRESULT > 0) { - item.CHECKRESULT_DESCRIPTION = ((CHECKRESULTEnum)item.CHECKRESULT).GetDescription(); + //item.CHECKRESULT_DESCRIPTION = ((CHECKRESULTEnum)item.CHECKRESULT).GetDescription(); + if (item.CHECKRESULT.HasValue && item.CHECKRESULT.Value == 10) + item.CHECKRESULT_DESCRIPTION = ((CHECKRESULTEnum)item.CHECKRESULT).GetDescription(); // 与问题描述一致 20 其它 30 等直接显示明细的 + item.QUESTION_LEVEL_DESCRIPTION = (item.QUESTION_LEVEL.HasValue && item.QUESTION_LEVEL != 0) ? ((BSQuestionLevelEnum)item.QUESTION_LEVEL).GetDescription() : ""; }