From c0449b799342c41baf447ea96469fe6b9a7a7f73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?= <10755671+mei-rong-he@user.noreply.gitee.com> Date: Thu, 29 Jan 2026 14:56:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E6=9F=A5=E9=80=9A=E7=9F=A5=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E5=8F=AF=E8=A7=86=E5=8C=96=E5=A2=9E=E5=8A=A0=E5=BD=92?= =?UTF-8?q?=E6=A1=A3=E8=8A=82=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Api/SecurityInspectionNoticeController.cs | 360 +++++++++++++++++- 1 file changed, 351 insertions(+), 9 deletions(-) diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionNoticeController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionNoticeController.cs index 61eebcc..e4bd0c8 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionNoticeController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionNoticeController.cs @@ -1676,7 +1676,11 @@ namespace APT.SK.WebApi.Controllers.Api T_SK_HIDDEN_DANGER_REPORT dangerReport = null; T_SK_HIDDEN_DANGER_HAND_REPORT hand = null; T_SK_HIDDEN_DANGER_CONFIRM confirm= null; + T_SK_SECURITY_INSPECTION_RECORD_SUMMARY recordSum = null; + List safeRecords = new List(); + List rectifyNotices = new List(); List rectifyRecords = new List(); + Guid Keyword = new Guid(filter.Keyword); //检查通知 var check = GetEntity(Keyword); @@ -1695,7 +1699,8 @@ namespace APT.SK.WebApi.Controllers.Api { confirmId = confirm.ID; sourceIds.Add(confirm.ID); - rectifyNoticeIds = GetEntities(e => e.HIDDEN_DANGER_CONFIRM_ID != null && e.HIDDEN_DANGER_CONFIRM_ID == confirm.ID, filter).Select(t => t.ID).ToList(); + rectifyNotices = GetEntities(e => e.HIDDEN_DANGER_CONFIRM_ID != null && e.HIDDEN_DANGER_CONFIRM_ID == confirm.ID, filter).ToList(); + rectifyNoticeIds = rectifyNotices.Select(t => t.ID).ToList(); if (rectifyNoticeIds != null && rectifyNoticeIds.Any()) { sourceIds.AddRange(rectifyNoticeIds); @@ -1710,16 +1715,17 @@ namespace APT.SK.WebApi.Controllers.Api sourceIds.AddRange(rectifyRecordIds); } } - GetAutoNext(sourceIds, check, safeNoticeId, hand, handId,confirm, confirmId, safeRecordIds, safeRecordSumId, dangerReportId, dangerReport, rectifyNoticeIds, rectifyRecordIds, rectifyRecords, ref result); + GetAutoNext(sourceIds, check, safeNoticeId, hand, handId, confirm, confirmId, safeRecordIds, safeRecords, safeRecordSumId, recordSum, dangerReportId, dangerReport, rectifyNoticeIds, rectifyNotices, rectifyRecordIds, rectifyRecords, ref result); } } else { safeNoticeId = check.ID; sourceIds.Add(check.ID); - safeRecordIds = GetEntities(e => e.SECURITY_INSPECTION_NOTICE_ID != null && e.SECURITY_INSPECTION_NOTICE_ID == check.ID, filter).Select(m=>m.ID).ToList(); + safeRecords = GetEntities(e => e.SECURITY_INSPECTION_NOTICE_ID != null && e.SECURITY_INSPECTION_NOTICE_ID == check.ID, filter).ToList(); + safeRecordIds = safeRecords.Select(m => m.ID).ToList(); sourceIds.AddRange(safeRecordIds); - var recordSum= GetEntity(e => e.SECURITY_INSPECTION_NOTICE_ID != null && e.SECURITY_INSPECTION_NOTICE_ID == check.ID); + recordSum= GetEntity(e => e.SECURITY_INSPECTION_NOTICE_ID != null && e.SECURITY_INSPECTION_NOTICE_ID == check.ID); if (recordSum != null) { safeRecordSumId = recordSum.ID; @@ -1729,7 +1735,8 @@ namespace APT.SK.WebApi.Controllers.Api { dangerReportId = dangerReport.ID; sourceIds.Add(dangerReport.ID); - rectifyNoticeIds = GetEntities(e => e.HIDDEN_DANGER_REPORT_ID != null && e.HIDDEN_DANGER_REPORT_ID == dangerReport.ID,filter).Select(t=>t.ID).ToList(); + rectifyNotices = GetEntities(e => e.HIDDEN_DANGER_REPORT_ID != null && e.HIDDEN_DANGER_REPORT_ID == dangerReport.ID,filter).ToList(); + rectifyNoticeIds = rectifyNotices.Select(t => t.ID).ToList(); if (rectifyNoticeIds != null && rectifyNoticeIds.Any()) { sourceIds.AddRange(rectifyNoticeIds); @@ -1745,13 +1752,13 @@ namespace APT.SK.WebApi.Controllers.Api } } } - GetAutoNext(sourceIds,check, safeNoticeId,hand, handId, confirm,confirmId, safeRecordIds, safeRecordSumId, dangerReportId, dangerReport, rectifyNoticeIds, rectifyRecordIds, rectifyRecords, ref result); + GetAutoNext(sourceIds,check, safeNoticeId,hand, handId, confirm,confirmId, safeRecordIds, safeRecords,safeRecordSumId, recordSum,dangerReportId, dangerReport, rectifyNoticeIds, rectifyNotices, rectifyRecordIds, rectifyRecords, ref result); } return result; } }); } - private void GetAutoNext(List sourceIds, T_SK_SECURITY_INSPECTION_NOTICE check, Guid? safeNoticeId, T_SK_HIDDEN_DANGER_HAND_REPORT hand,Guid? handId, T_SK_HIDDEN_DANGER_CONFIRM confirm,Guid? confirmId, List safeRecordIds, Guid? safeRecordSumId, Guid? dangerReportId, T_SK_HIDDEN_DANGER_REPORT dangerReport, List rectifyNoticeIds, List rectifyRecordIds, List rectifyRecords, ref List result) + private void GetAutoNext(List sourceIds, T_SK_SECURITY_INSPECTION_NOTICE check, Guid? safeNoticeId, T_SK_HIDDEN_DANGER_HAND_REPORT hand,Guid? handId, T_SK_HIDDEN_DANGER_CONFIRM confirm,Guid? confirmId, List safeRecordIds, List safeRecords, Guid? safeRecordSumId, T_SK_SECURITY_INSPECTION_RECORD_SUMMARY recordSum, Guid? dangerReportId, T_SK_HIDDEN_DANGER_REPORT dangerReport, List rectifyNoticeIds, List rectifyNotices,List rectifyRecordIds, List rectifyRecords, ref List result) { var approveIds = new List(); var approves = new List(); @@ -1908,6 +1915,33 @@ namespace APT.SK.WebApi.Controllers.Api start1.STATUS = 0; noticeLog.logList.Add(start1); } + //归档 + if (check.STATUS == PFStandardStatus.Archived || check.STATUS == PFStandardStatus.Close) + { + OperateLogList start = new OperateLogList(); + start.ID = safeNoticeId; + start.CODE = "SK006_SHOWPRINT"; + start.USER_NAME = temp1.USER_NAME; + start.NAME = "安全检查通知归档"; + start.DEAL_DATE = check.MODIFY_TIME; + start.CREATE_TIME = check.CREATE_TIME; + start.STATUS = 5 ; + noticeLog.logList.Add(start); + + } + else + { + //手动发起的检查通知 + OperateLogList start = new OperateLogList(); + start.ID = check.ID; + start.CODE = "SK006_SHOWPRINT"; + start.USER_NAME = checkUser.NAME; + start.NAME = "安全检查通知归档"; + start.DEAL_DATE = check.MODIFY_TIME; + start.CREATE_TIME = check.CREATE_TIME; + start.STATUS = 0; + noticeLog.logList.Add(start); + } } result.Add(noticeLog); #endregion @@ -1935,6 +1969,36 @@ namespace APT.SK.WebApi.Controllers.Api start.CREATE_TIME = temp1.CREATE_TIME; start.STATUS = temp1.NOTICE_STATUS == 1 ? 5 : temp1.NOTICE_STATUS == 2 ? 10 : temp1.NOTICE_STATUS == 4 ? 15 : (temp1.NOTICE_STATUS == 0 && temp1.TASK_ENDDT >= DateTime.Now) ? 16 : (temp1.TASK_ENDDT < DateTime.Now && temp1.NOTICE_STATUS == 0) ? 20 : 0; recordLog.logList.Add(start); + var record = safeRecords.FirstOrDefault(t => t.ID == temp1.SOURCE_DATA_ID); + if (record != null) + { + //归档 + 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.NAME = "安全检查记录归档"; + start1.DEAL_DATE = record.MODIFY_TIME; + start1.CREATE_TIME = record.CREATE_TIME; + start1.STATUS = 5; + recordLog.logList.Add(start1); + + } + else + { + OperateLogList start1 = new OperateLogList(); + start1.ID = temp1.SOURCE_DATA_ID; + start1.CODE = "SK010_SHOWPRINT"; + start1.USER_NAME = temp1.USER_NAME; + start1.NAME = "安全检查记录归档"; + start1.DEAL_DATE = record.MODIFY_TIME; + start1.CREATE_TIME = record.CREATE_TIME; + start1.STATUS = 0; + recordLog.logList.Add(start1); + } + } } } var temp3 = itemps.Where(t => t.NOTICE_STATUS != 1).OrderByDescending(n => n.NOTICE_STATUS).ThenBy(m => m.MODIFY_TIME).ToList(); @@ -1951,8 +2015,39 @@ namespace APT.SK.WebApi.Controllers.Api start.CREATE_TIME = temp1.CREATE_TIME; start.STATUS = temp1.NOTICE_STATUS == 1 ? 5 : temp1.NOTICE_STATUS == 2 ? 10 : temp1.NOTICE_STATUS == 4 ? 15 : (temp1.NOTICE_STATUS == 0 && temp1.TASK_ENDDT >= DateTime.Now) ? 16 : (temp1.TASK_ENDDT < DateTime.Now && temp1.NOTICE_STATUS == 0) ? 20 : 0; recordLog.logList.Add(start); + var record = safeRecords.FirstOrDefault(t => t.ID == temp1.SOURCE_DATA_ID); + if (record != null) + { + //归档 + 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.NAME = "安全检查记录归档"; + start1.DEAL_DATE = record.MODIFY_TIME; + start1.CREATE_TIME = record.CREATE_TIME; + start1.STATUS = 5; + recordLog.logList.Add(start1); + + } + else + { + OperateLogList start1 = new OperateLogList(); + start1.ID = temp1.SOURCE_DATA_ID; + start1.CODE = "SK010_SHOWPRINT"; + start1.USER_NAME = temp1.USER_NAME; + start1.NAME = "安全检查记录归档"; + start1.DEAL_DATE = record.MODIFY_TIME; + start1.CREATE_TIME = record.CREATE_TIME; + start1.STATUS = 0; + recordLog.logList.Add(start1); + } + } } } + } else { @@ -1965,6 +2060,15 @@ namespace APT.SK.WebApi.Controllers.Api start1.CREATE_TIME = null; start1.STATUS = 0; recordLog.logList.Add(start1); + OperateLogList start2 = new OperateLogList(); + start2.ID = null; + start2.CODE = "SK010_SHOWPRINT"; + start2.USER_NAME = "检查人"; + start2.NAME = "安全检查记录归档"; + start2.DEAL_DATE = null; + start2.CREATE_TIME = null; + start2.STATUS = 0; + recordLog.logList.Add(start2); } } else @@ -1978,6 +2082,15 @@ namespace APT.SK.WebApi.Controllers.Api start1.CREATE_TIME = null; start1.STATUS = 0; recordLog.logList.Add(start1); + OperateLogList start2 = new OperateLogList(); + start2.ID = null; + start2.CODE = "SK010_SHOWPRINT"; + start2.USER_NAME = "检查人"; + start2.NAME = "安全检查记录归档"; + start2.DEAL_DATE = null; + start2.CREATE_TIME = null; + start2.STATUS = 0; + recordLog.logList.Add(start2); } result.Add(recordLog); #endregion @@ -2016,6 +2129,32 @@ 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); + //归档 + if (recordSum.STATUS == PFStandardStatus.Archived) + { + OperateLogList start2 = new OperateLogList(); + start2.ID = safeRecordSumId; + start2.CODE = "SK012_SHOWPRINT"; + start2.USER_NAME = item.USER_NAME; + start2.NAME = "安全检查记录汇总归档"; + start2.DEAL_DATE = recordSum.MODIFY_TIME; + start2.CREATE_TIME = recordSum.CREATE_TIME; + start2.STATUS = 5; + recordSumLog.logList.Add(start2); + + } + else + { + OperateLogList start2 = new OperateLogList(); + start2.ID = safeRecordSumId; + start2.CODE = "SK012_SHOWPRINT"; + start2.USER_NAME = item.USER_NAME; + start2.NAME = "安全检查记录汇总归档"; + start2.DEAL_DATE = recordSum.MODIFY_TIME; + start2.CREATE_TIME = recordSum.CREATE_TIME; + start2.STATUS = 0; + recordSumLog.logList.Add(start2); + } } } var temp4 = temp2.Where(t => t.NOTICE_STATUS != 1).OrderByDescending(n => n.NOTICE_STATUS).ThenBy(m => m.MODIFY_TIME).ToList(); @@ -2032,6 +2171,31 @@ 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); + //归档 + if (recordSum.STATUS == PFStandardStatus.Archived) + { + OperateLogList start2 = new OperateLogList(); + start2.ID = safeRecordSumId; + start2.CODE = "SK012_SHOWPRINT"; + start2.USER_NAME = item.USER_NAME; + start2.NAME = "安全检查记录汇总归档"; + start2.DEAL_DATE = recordSum.MODIFY_TIME; + start2.CREATE_TIME = recordSum.CREATE_TIME; + start2.STATUS = 5; + recordSumLog.logList.Add(start2); + } + else + { + OperateLogList start2 = new OperateLogList(); + start2.ID = safeRecordSumId; + start2.CODE = "SK012_SHOWPRINT"; + start2.USER_NAME = item.USER_NAME; + start2.NAME = "安全检查记录汇总归档"; + start2.DEAL_DATE = recordSum.MODIFY_TIME; + start2.CREATE_TIME = recordSum.CREATE_TIME; + start2.STATUS = 0; + recordSumLog.logList.Add(start2); + } } } } @@ -2046,6 +2210,15 @@ namespace APT.SK.WebApi.Controllers.Api start1.CREATE_TIME = null; start1.STATUS = 0; recordSumLog.logList.Add(start1); + OperateLogList start2 = new OperateLogList(); + start2.ID = null; + start2.CODE = "SK012_SHOWPRINT"; + start2.USER_NAME = "检查人"; + start2.NAME = "安全检查记录汇总归档"; + start2.DEAL_DATE = null; + start2.CREATE_TIME = null; + start2.STATUS = 0; + recordSumLog.logList.Add(start2); } } else @@ -2068,6 +2241,15 @@ namespace APT.SK.WebApi.Controllers.Api start1.CREATE_TIME = null; start1.STATUS = 0; recordSumLog.logList.Add(start1); + OperateLogList start2 = new OperateLogList(); + start2.ID = null; + start2.CODE = "SK012_SHOWPRINT"; + start2.USER_NAME = "检查人"; + start2.NAME = "安全检查记录汇总归档"; + start2.DEAL_DATE = null; + start2.CREATE_TIME = null; + start2.STATUS = 0; + recordSumLog.logList.Add(start2); } result.Add(recordSumLog); #endregion @@ -2211,6 +2393,40 @@ namespace APT.SK.WebApi.Controllers.Api start1.CREATE_TIME = null; start1.STATUS = 0; hiddenReportLog.logList.Add(start1); + OperateLogList start3 = new OperateLogList(); + start3.ID = null; + start3.CODE = "SK014_SHOWPRINT"; + start3.USER_NAME = "整改责任人"; + start3.NAME = "隐患上报归档"; + start3.DEAL_DATE = null; + start3.CREATE_TIME = null; + start3.STATUS = 0; + hiddenReportLog.logList.Add(start3); + } + //归档 + if (dangerReport.STATUS == PFStandardStatus.Archived) + { + OperateLogList start3 = new OperateLogList(); + start3.ID = null; + start3.CODE = "SK014_SHOWPRINT"; + start3.USER_NAME = "整改责任人"; + start3.NAME = "隐患上报归档"; + start3.DEAL_DATE = dangerReport.MODIFY_TIME; + start3.CREATE_TIME = dangerReport.CREATE_TIME; + start3.STATUS = 5; + hiddenReportLog.logList.Add(start3); + } + else + { + OperateLogList start3 = new OperateLogList(); + start3.ID = null; + start3.CODE = "SK014_SHOWPRINT"; + start3.USER_NAME = "整改责任人"; + start3.NAME = "隐患上报归档"; + start3.DEAL_DATE = dangerReport.MODIFY_TIME; + start3.CREATE_TIME = dangerReport.CREATE_TIME; + start3.STATUS = 0; + hiddenReportLog.logList.Add(start3); } } else @@ -2242,6 +2458,15 @@ namespace APT.SK.WebApi.Controllers.Api start1.CREATE_TIME = null; start1.STATUS = 0; hiddenReportLog.logList.Add(start1); + OperateLogList start3 = new OperateLogList(); + start3.ID = null; + start3.CODE = "SK014_SHOWPRINT"; + start3.USER_NAME = "整改责任人"; + start3.NAME = "隐患上报归档"; + start3.DEAL_DATE = null; + start3.CREATE_TIME = null; + start3.STATUS = 0; + hiddenReportLog.logList.Add(start3); } result.Add(hiddenReportLog); #endregion @@ -2259,9 +2484,19 @@ namespace APT.SK.WebApi.Controllers.Api start.USER_NAME = handUser.NAME; start.NAME = "手动隐患上报"; start.DEAL_DATE = hand.STATUS == PFStandardStatus.Draft ? null : hand.MODIFY_TIME; - start.CREATE_TIME = check.CREATE_TIME; + start.CREATE_TIME = hand.CREATE_TIME; start.STATUS = hand.STATUS == PFStandardStatus.Draft ? 16 : 5; handLog.logList.Add(start); + //归档 + OperateLogList startA = new OperateLogList(); + startA.ID = handId; + startA.CODE = "SK016_SHOWPRINT"; + startA.USER_NAME = handUser.NAME; + startA.NAME = "手动隐患上报归档"; + startA.DEAL_DATE = hand.STATUS == PFStandardStatus.Draft ? null : hand.MODIFY_TIME; + startA.CREATE_TIME = hand.CREATE_TIME; + startA.STATUS = hand.STATUS == PFStandardStatus.Archived ? 5 : 0; + handLog.logList.Add(startA); #endregion #region 隐患确认单 OperateLog confirmLog = new OperateLog(); @@ -2382,6 +2617,16 @@ namespace APT.SK.WebApi.Controllers.Api start2.STATUS = 0; confirmLog.logList.Add(start2); } + //归档 + OperateLogList start4 = new OperateLogList(); + start4.ID = null; + start4.CODE = "SK018_SHOWPRINT"; + start4.USER_NAME = "整改责任人"; + start4.NAME = "隐患确认单归档"; + start4.DEAL_DATE = confirm.MODIFY_TIME; + start4.CREATE_TIME = confirm.CREATE_TIME; + start4.STATUS = confirm.STATUS == PFStandardStatus.Archived ? 5:0; + confirmLog.logList.Add(start4); } else { @@ -2412,6 +2657,15 @@ namespace APT.SK.WebApi.Controllers.Api start3.CREATE_TIME = null; start3.STATUS = 0; confirmLog.logList.Add(start3); + OperateLogList start4 = new OperateLogList(); + start4.ID = null; + start4.CODE = "SK018_SHOWPRINT"; + start4.USER_NAME = "整改责任人"; + start4.NAME = "隐患确认单归档"; + start4.DEAL_DATE = null; + start4.CREATE_TIME = null; + start4.STATUS = 0; + confirmLog.logList.Add(start4); } #endregion } @@ -2486,6 +2740,32 @@ namespace APT.SK.WebApi.Controllers.Api start1.STATUS = 0; rectifyNoticeLog.logList.Add(start1); } + //归档 + var rectifyNotice = rectifyNotices.FirstOrDefault(t => t.ID == temp1.SOURCE_DATA_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.NAME = "隐患整改通知归档"; + start2.DEAL_DATE = rectifyNotice.MODIFY_TIME; + start2.CREATE_TIME = rectifyNotice.CREATE_TIME; + start2.STATUS = 5; + rectifyNoticeLog.logList.Add(start2); + } + else + { + OperateLogList start2 = new OperateLogList(); + start2.ID = temp1.SOURCE_DATA_ID; + start2.CODE = "SK020_SHOWPRINT"; + start2.USER_NAME = temp1.USER_NAME; + start2.NAME = "隐患整改通知归档"; + start2.DEAL_DATE = rectifyNotice.MODIFY_TIME; + start2.CREATE_TIME = rectifyNotice.CREATE_TIME; + start2.STATUS = 0; + rectifyNoticeLog.logList.Add(start2); + } result.Add(rectifyNoticeLog); } } @@ -2512,6 +2792,15 @@ namespace APT.SK.WebApi.Controllers.Api start1.CREATE_TIME = null; start1.STATUS = 0; rectifyNoticeLog.logList.Add(start1); + OperateLogList start2 = new OperateLogList(); + start2.ID = null; + start2.CODE = "SK020_SHOWPRINT"; + start2.USER_NAME = "整改责任人"; + start2.NAME = "隐患整改通知归档"; + start2.DEAL_DATE = null; + start2.CREATE_TIME = null; + start2.STATUS = 0; + rectifyNoticeLog.logList.Add(start2); result.Add(rectifyNoticeLog); } } @@ -2538,6 +2827,15 @@ namespace APT.SK.WebApi.Controllers.Api start1.CREATE_TIME = null; start1.STATUS = 0; rectifyNoticeLog.logList.Add(start1); + OperateLogList start2 = new OperateLogList(); + start2.ID = null; + start2.CODE = "SK020_SHOWPRINT"; + start2.USER_NAME = "整改责任人"; + start2.NAME = "隐患整改通知归档"; + start2.DEAL_DATE = null; + start2.CREATE_TIME = null; + start2.STATUS = 0; + rectifyNoticeLog.logList.Add(start2); result.Add(rectifyNoticeLog); } #endregion @@ -2644,13 +2942,39 @@ namespace APT.SK.WebApi.Controllers.Api } } } + //归档 + var rectifyRecord= rectifyRecords.FirstOrDefault(t => t.ID == temp1.SOURCE_DATA_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.NAME = "隐患整改记录归档"; + start1.DEAL_DATE = rectifyRecord.MODIFY_TIME; + start1.CREATE_TIME = rectifyRecord.CREATE_TIME; + start1.STATUS = 5; + refRecordLog.logList.Add(start1); + } + else + { + OperateLogList start1 = new OperateLogList(); + start1.ID = temp1.SOURCE_DATA_ID; + start1.CODE = "SK022_SHOWPRINT"; + start1.USER_NAME = temp1.USER_NAME; + start1.NAME = "隐患整改记录归档"; + start1.DEAL_DATE = rectifyRecord.MODIFY_TIME; + start1.CREATE_TIME = rectifyRecord.CREATE_TIME; + start1.STATUS = 0; + refRecordLog.logList.Add(start1); + } result.Add(refRecordLog); } } else { OperateLog refRecordLog = new OperateLog(); - refRecordLog.FORM_NAME = "隐患整改通知"; + refRecordLog.FORM_NAME = "隐患整改记录"; refRecordLog.logList = new List(); OperateLogList start = new OperateLogList(); start.ID = null; @@ -2679,6 +3003,15 @@ namespace APT.SK.WebApi.Controllers.Api start2.CREATE_TIME = null; start2.STATUS = 0; refRecordLog.logList.Add(start2); + OperateLogList start3 = new OperateLogList(); + start3.ID = null; + start3.CODE = "SK022_SHOWPRINT"; + start3.USER_NAME = "审批人"; + start3.NAME = "隐患整改记录归档"; + start3.DEAL_DATE = null; + start3.CREATE_TIME = null; + start3.STATUS = 0; + refRecordLog.logList.Add(start3); result.Add(refRecordLog); } } @@ -2714,6 +3047,15 @@ namespace APT.SK.WebApi.Controllers.Api start2.CREATE_TIME = null; start2.STATUS = 0; refRecordLog.logList.Add(start2); + OperateLogList start3 = new OperateLogList(); + start3.ID = null; + start3.CODE = "SK022_SHOWPRINT"; + start3.USER_NAME = "审批人"; + start3.NAME = "隐患整改记录归档"; + start3.DEAL_DATE = null; + start3.CREATE_TIME = null; + start3.STATUS = 0; + refRecordLog.logList.Add(start3); result.Add(refRecordLog); } #endregion