ccy/mh_sms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改同步

Browse Source
This commit is contained in:
wyw 2024-02-05 17:07:03 +08:00
parent 66e081bdc4
commit 722f55910a
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSRiskSubmitController.cs
View File

@ -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); 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; T_FM_NOTIFICATION_TASK task = null;
GetEntityTask(entity.TaskID, ref task, "BS044_SHOWPRINT"); GetEntityTask(entity.TaskID, ref task, "BS044_SHOWPRINT");
@ -3359,12 +3359,12 @@ namespace APT.BS.WebApi.Controllers.Api
//验收人验收 通过 发起审批流 //验收人验收 通过 发起审批流
//不通过 返给 整改落实人 //不通过 返给 整改落实人
var sysFilter = new SystemCodeFilter(); //var sysFilter = new SystemCodeFilter();
sysFilter.CodeType = (int)PFCodeRuleType.审批流编码; //sysFilter.CodeType = (int)PFCodeRuleType.审批流编码;
sysFilter.Count = 2; //sysFilter.Count = 2;
sysFilter.OrgId = filter.OrgId; //sysFilter.OrgId = filter.OrgId;
//var serialCode = CodeRuleService.NewGenSerial(sysFilter); //var serialCode = CodeRuleService.NewGenSerial(sysFilter);
List<string> listCode = CodeRuleService.NewGenSerial(sysFilter).Split(',').ToList(); //List<string> listCode = CodeRuleService.NewGenSerial(sysFilter).Split(',').ToList();
return SafeExecute<bool>(() => return SafeExecute<bool>(() =>
{ {
int DEALSITUATION = 0; int DEALSITUATION = 0;
@ -3444,7 +3444,7 @@ namespace APT.BS.WebApi.Controllers.Api
entity.ISDEALSIGN = true; entity.ISDEALSIGN = true;
entity.DATETIME_DEALSIGN = DateTime.Now; entity.DATETIME_DEALSIGN = DateTime.Now;
DateTime dtEnd = NotificationTaskService.GetTaskEndTime(FMTASKTYPE.BS_RiskUp_Checker_Check, entity.ORG_ID.Value, DateTime.Now, null, content.LastDateUser); 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(() => this.UnifiedCommit(() =>
{ {
@ -3494,6 +3494,9 @@ namespace APT.BS.WebApi.Controllers.Api
entity.Nav_Submit = this.GetEntity<T_BS_RISK_SUBMIT>(entity.RISK_SUBMIT_ID.Value); entity.Nav_Submit = this.GetEntity<T_BS_RISK_SUBMIT>(entity.RISK_SUBMIT_ID.Value);
} }
var code = DateTime.Now.ToString("yyyyMMddHHmm");
List<string> listCode = new List<string>() { code + "1", code + "2" };
//审批流 //审批流
MFlowPermitService.InsertApprove(listCode[0], "BS043", parms, entity.ID, "BS044_SHOWPRINT", TaskID, true, () => MFlowPermitService.InsertApprove(listCode[0], "BS043", parms, entity.ID, "BS044_SHOWPRINT", TaskID, true, () =>
{ {

5
APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSSafeCheckController.cs
View File

@ -2997,7 +2997,10 @@ namespace APT.BS.WebApi.Controllers.Api
} }
if (item.CHECKRESULT.HasValue && item.CHECKRESULT > 0) 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() : ""; item.QUESTION_LEVEL_DESCRIPTION = (item.QUESTION_LEVEL.HasValue && item.QUESTION_LEVEL != 0) ? ((BSQuestionLevelEnum)item.QUESTION_LEVEL).GetDescription() : "";
} }