diff --git a/APT.BaseData.Services/Services/FM/FMFlowPermitService.cs b/APT.BaseData.Services/Services/FM/FMFlowPermitService.cs index 1a5cfcd..18e33f5 100644 --- a/APT.BaseData.Services/Services/FM/FMFlowPermitService.cs +++ b/APT.BaseData.Services/Services/FM/FMFlowPermitService.cs @@ -321,9 +321,9 @@ namespace APT.BaseData.Services.Services.FM { T_PF_APPROVE approve = null; //上个消息 - T_FM_NOTIFICATION_TASK finishNotice = null; - //发消息 - T_FM_NOTIFICATION_TASK notice = null; + T_FM_NOTIFICATION_TASK finishNotice = null; + //发消息 + List notices = new List(); T_FM_NOTIFICATION_TASK curentTask = null; //细表 List appdetails = new List(); @@ -571,8 +571,9 @@ namespace APT.BaseData.Services.Services.FM { var sendUserName = users.FirstOrDefault(i => i.ID == sendUserId)?.NAME; //发消息 - notice = NotificationTaskService.InsertUserNoticeTaskModel(taskName, approve.ID, approve.ORG_ID, (Guid)sendUserId, sendUserName, startTime, + var notice = NotificationTaskService.InsertUserNoticeTaskModel(taskName, approve.ID, approve.ORG_ID, (Guid)sendUserId, sendUserName, startTime, endTime, (int)FMNoticeTypeEnum.审批, "PF119"); + notices.Add(notice); } } } @@ -629,9 +630,11 @@ namespace APT.BaseData.Services.Services.FM if (appdetails != null && appdetails.Any()) BantchAddEntityNoCommit(appdetails); if (finishNotice != null && finishNotice.ID != Guid.Empty) - UpdateEntityNoCommit(finishNotice, "NOTICE_STATUS", "TASK_DT", "MODIFIER_ID"); - if (notice != null) - AddEntityNoCommit(notice); + UpdateEntityNoCommit(finishNotice, "NOTICE_STATUS", "TASK_DT", "MODIFIER_ID"); + if (notices != null && notices.Any()) + BantchAddEntityNoCommit(notices); + //if (notice != null) + // AddEntityNoCommit(notice); if (curentTask != null) AddEntityNoCommit(curentTask); if (listBSLog != null && listBSLog.Any()) diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionNoticeController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionNoticeController.cs index 8284034..bd5fe3c 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionNoticeController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionNoticeController.cs @@ -2106,6 +2106,7 @@ namespace APT.SK.WebApi.Controllers.Api recordSumLog.logList = new List(); if (safeRecordSumId != null) { + var recordSumUser = users.FirstOrDefault(t => t.ID == recordSum.APPLY_USER_ID); //发起 var temp1 = tasks.FirstOrDefault(t => t.SOURCE_DATA_ID == safeRecordSumId && !t.NOTICE_TITLE.Contains("确认")); OperateLogList start = new OperateLogList(); @@ -2141,7 +2142,7 @@ namespace APT.SK.WebApi.Controllers.Api OperateLogList start2 = new OperateLogList(); start2.ID = safeRecordSumId; start2.CODE = "SK012_SHOWPRINT"; - start2.USER_NAME = item.USER_NAME; + start2.USER_NAME = recordSumUser.NAME; start2.NAME = "安全检查记录汇总归档"; start2.DEAL_DATE = recordSum.MODIFY_TIME; start2.CREATE_TIME = recordSum.CREATE_TIME; @@ -2154,7 +2155,7 @@ namespace APT.SK.WebApi.Controllers.Api OperateLogList start2 = new OperateLogList(); start2.ID = safeRecordSumId; start2.CODE = "SK012_SHOWPRINT"; - start2.USER_NAME = item.USER_NAME; + start2.USER_NAME = recordSumUser.NAME; start2.NAME = "安全检查记录汇总归档"; start2.DEAL_DATE = recordSum.MODIFY_TIME; start2.CREATE_TIME = recordSum.CREATE_TIME; @@ -2177,7 +2178,6 @@ namespace APT.SK.WebApi.Controllers.Api start1.CREATE_TIME = item.CREATE_TIME; start1.STATUS = item.NOTICE_STATUS == 1 ? 5 : item.NOTICE_STATUS == 2 ? 10 : item.NOTICE_STATUS == 4 ? 15 : (item.NOTICE_STATUS == 0 && item.TASK_ENDDT >= DateTime.Now) ? 16 : (item.TASK_ENDDT < DateTime.Now && item.NOTICE_STATUS == 0) ? 20 : 0; recordSumLog.logList.Add(start1); - var recordSumUser = users.FirstOrDefault(t => t.ID == recordSum.APPLY_USER_ID); //归档 if (recordSum.STATUS == PFStandardStatus.Archived) {