diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionNoticeController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionNoticeController.cs index 9bad54b..8284034 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionNoticeController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionNoticeController.cs @@ -1925,7 +1925,7 @@ namespace APT.SK.WebApi.Controllers.Api OperateLogList start = new OperateLogList(); start.ID = safeNoticeId; start.CODE = "SK006_SHOWPRINT"; - start.USER_NAME = temp1.USER_NAME; + start.USER_NAME = checkUser.NAME; start.NAME = "安全检查通知归档"; start.DEAL_DATE = check.MODIFY_TIME; start.CREATE_TIME = check.CREATE_TIME; @@ -1976,13 +1976,14 @@ namespace APT.SK.WebApi.Controllers.Api var record = safeRecords.FirstOrDefault(t => t.ID == temp1.SOURCE_DATA_ID); if (record != null) { + var recordUser = users.FirstOrDefault(t => t.ID == record.APPLY_USER_ID); //归档 if (record.STATUS == PFStandardStatus.Archived || record.STATUS == PFStandardStatus.Close) { OperateLogList start1 = new OperateLogList(); start1.ID = temp1.SOURCE_DATA_ID; start1.CODE = "SK010_SHOWPRINT"; - start1.USER_NAME = temp1.USER_NAME; + start1.USER_NAME = recordUser.NAME; start1.NAME = "安全检查记录归档"; start1.DEAL_DATE = record.MODIFY_TIME; start1.CREATE_TIME = record.CREATE_TIME; @@ -1995,7 +1996,7 @@ namespace APT.SK.WebApi.Controllers.Api OperateLogList start1 = new OperateLogList(); start1.ID = temp1.SOURCE_DATA_ID; start1.CODE = "SK010_SHOWPRINT"; - start1.USER_NAME = temp1.USER_NAME; + start1.USER_NAME = recordUser.NAME; start1.NAME = "安全检查记录归档"; start1.DEAL_DATE = record.MODIFY_TIME; start1.CREATE_TIME = record.CREATE_TIME; @@ -2022,13 +2023,14 @@ namespace APT.SK.WebApi.Controllers.Api var record = safeRecords.FirstOrDefault(t => t.ID == temp1.SOURCE_DATA_ID); if (record != null) { + var recordUser = users.FirstOrDefault(t => t.ID == record.APPLY_USER_ID); //归档 if (record.STATUS == PFStandardStatus.Archived || record.STATUS == PFStandardStatus.Close) { OperateLogList start1 = new OperateLogList(); start1.ID = temp1.SOURCE_DATA_ID; start1.CODE = "SK010_SHOWPRINT"; - start1.USER_NAME = temp1.USER_NAME; + start1.USER_NAME = recordUser.NAME; start1.NAME = "安全检查记录归档"; start1.DEAL_DATE = record.MODIFY_TIME; start1.CREATE_TIME = record.CREATE_TIME; @@ -2041,7 +2043,7 @@ namespace APT.SK.WebApi.Controllers.Api OperateLogList start1 = new OperateLogList(); start1.ID = temp1.SOURCE_DATA_ID; start1.CODE = "SK010_SHOWPRINT"; - start1.USER_NAME = temp1.USER_NAME; + start1.USER_NAME = recordUser.NAME; start1.NAME = "安全检查记录归档"; start1.DEAL_DATE = record.MODIFY_TIME; start1.CREATE_TIME = record.CREATE_TIME; @@ -2175,13 +2177,14 @@ 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) { 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; @@ -2193,7 +2196,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; @@ -2407,13 +2410,14 @@ namespace APT.SK.WebApi.Controllers.Api start3.STATUS = 0; hiddenReportLog.logList.Add(start3); } + var dangerReportUser = users.FirstOrDefault(t => t.ID == dangerReport.APPLY_USER_ID); //归档 if (dangerReport.STATUS == PFStandardStatus.Archived) { OperateLogList start3 = new OperateLogList(); start3.ID = null; start3.CODE = "SK014_SHOWPRINT"; - start3.USER_NAME = "整改责任人"; + start3.USER_NAME = dangerReportUser.NAME; start3.NAME = "隐患上报归档"; start3.DEAL_DATE = dangerReport.MODIFY_TIME; start3.CREATE_TIME = dangerReport.CREATE_TIME; @@ -2425,7 +2429,7 @@ namespace APT.SK.WebApi.Controllers.Api OperateLogList start3 = new OperateLogList(); start3.ID = null; start3.CODE = "SK014_SHOWPRINT"; - start3.USER_NAME = "整改责任人"; + start3.USER_NAME = dangerReportUser.NAME; start3.NAME = "隐患上报归档"; start3.DEAL_DATE = dangerReport.MODIFY_TIME; start3.CREATE_TIME = dangerReport.CREATE_TIME; @@ -2621,11 +2625,12 @@ namespace APT.SK.WebApi.Controllers.Api start2.STATUS = 0; confirmLog.logList.Add(start2); } + var confirmUser = users.FirstOrDefault(t => t.ID == confirm.APPLY_USER_ID); //归档 OperateLogList start4 = new OperateLogList(); start4.ID = null; start4.CODE = "SK018_SHOWPRINT"; - start4.USER_NAME = "整改责任人"; + start4.USER_NAME = confirmUser.NAME; start4.NAME = "隐患确认单归档"; start4.DEAL_DATE = confirm.MODIFY_TIME; start4.CREATE_TIME = confirm.CREATE_TIME; @@ -2746,12 +2751,13 @@ namespace APT.SK.WebApi.Controllers.Api } //归档 var rectifyNotice = rectifyNotices.FirstOrDefault(t => t.ID == temp1.SOURCE_DATA_ID); + var rectifyNoticeUser = users.FirstOrDefault(t => t.ID == rectifyNotice.APPLY_USER_ID); if (rectifyNotice != null && rectifyNotice.STATUS == PFStandardStatus.Archived) { OperateLogList start2 = new OperateLogList(); start2.ID = temp1.SOURCE_DATA_ID; start2.CODE = "SK020_SHOWPRINT"; - start2.USER_NAME = temp1.USER_NAME; + start2.USER_NAME = rectifyNoticeUser.NAME; start2.NAME = "隐患整改通知归档"; start2.DEAL_DATE = rectifyNotice.MODIFY_TIME; start2.CREATE_TIME = rectifyNotice.CREATE_TIME; @@ -2763,7 +2769,7 @@ namespace APT.SK.WebApi.Controllers.Api OperateLogList start2 = new OperateLogList(); start2.ID = temp1.SOURCE_DATA_ID; start2.CODE = "SK020_SHOWPRINT"; - start2.USER_NAME = temp1.USER_NAME; + start2.USER_NAME = rectifyNoticeUser.NAME; start2.NAME = "隐患整改通知归档"; start2.DEAL_DATE = rectifyNotice.MODIFY_TIME; start2.CREATE_TIME = rectifyNotice.CREATE_TIME; @@ -2948,12 +2954,13 @@ namespace APT.SK.WebApi.Controllers.Api } //归档 var rectifyRecord= rectifyRecords.FirstOrDefault(t => t.ID == temp1.SOURCE_DATA_ID); + var rectifyRecordUser = users.FirstOrDefault(t => t.ID == rectifyRecord.APPLY_USER_ID); if (rectifyRecord != null && rectifyRecord.STATUS == PFStandardStatus.Archived) { OperateLogList start1 = new OperateLogList(); start1.ID = temp1.SOURCE_DATA_ID; start1.CODE = "SK022_SHOWPRINT"; - start1.USER_NAME = temp1.USER_NAME; + start1.USER_NAME = rectifyRecordUser.NAME; start1.NAME = "隐患整改记录归档"; start1.DEAL_DATE = rectifyRecord.MODIFY_TIME; start1.CREATE_TIME = rectifyRecord.CREATE_TIME; @@ -2965,7 +2972,7 @@ namespace APT.SK.WebApi.Controllers.Api OperateLogList start1 = new OperateLogList(); start1.ID = temp1.SOURCE_DATA_ID; start1.CODE = "SK022_SHOWPRINT"; - start1.USER_NAME = temp1.USER_NAME; + start1.USER_NAME = rectifyRecordUser.NAME; start1.NAME = "隐患整改记录归档"; start1.DEAL_DATE = rectifyRecord.MODIFY_TIME; start1.CREATE_TIME = rectifyRecord.CREATE_TIME;