wyw/mh_jy_safe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

检查通知流程可视化增加归档节点

Browse Source
This commit is contained in:
何美荣 2026-01-29 14:56:07 +08:00
parent 855028cd08
commit c0449b7993
1 changed files with 351 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

440
APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionNoticeController.cs
View File

@ -1676,7 +1676,11 @@ namespace APT.SK.WebApi.Controllers.Api
T_SK_HIDDEN_DANGER_REPORT dangerReport = null; T_SK_HIDDEN_DANGER_REPORT dangerReport = null;
T_SK_HIDDEN_DANGER_HAND_REPORT hand = null; T_SK_HIDDEN_DANGER_HAND_REPORT hand = null;
T_SK_HIDDEN_DANGER_CONFIRM confirm= null; T_SK_HIDDEN_DANGER_CONFIRM confirm= null;
T_SK_SECURITY_INSPECTION_RECORD_SUMMARY recordSum = null;
List<T_SK_SECURITY_INSPECTION_RECORD> safeRecords = new List<T_SK_SECURITY_INSPECTION_RECORD>();
List<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE> rectifyNotices = new List<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE>();
List<T_SK_HIDDEN_DANGER_RECTIFY_RECORD> rectifyRecords = new List<T_SK_HIDDEN_DANGER_RECTIFY_RECORD>(); List<T_SK_HIDDEN_DANGER_RECTIFY_RECORD> rectifyRecords = new List<T_SK_HIDDEN_DANGER_RECTIFY_RECORD>();
Guid Keyword = new Guid(filter.Keyword); Guid Keyword = new Guid(filter.Keyword);
//检查通知 //检查通知
var check = GetEntity<T_SK_SECURITY_INSPECTION_NOTICE>(Keyword); var check = GetEntity<T_SK_SECURITY_INSPECTION_NOTICE>(Keyword);
@ -1695,7 +1699,8 @@ namespace APT.SK.WebApi.Controllers.Api
{ {
confirmId = confirm.ID; confirmId = confirm.ID;
sourceIds.Add(confirm.ID); sourceIds.Add(confirm.ID);
rectifyNoticeIds = GetEntities<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE>(e => e.HIDDEN_DANGER_CONFIRM_ID != null && e.HIDDEN_DANGER_CONFIRM_ID == confirm.ID, filter).Select(t => t.ID).ToList(); rectifyNotices = GetEntities<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE>(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()) if (rectifyNoticeIds != null && rectifyNoticeIds.Any())
{ {
sourceIds.AddRange(rectifyNoticeIds); sourceIds.AddRange(rectifyNoticeIds);
@ -1710,16 +1715,17 @@ namespace APT.SK.WebApi.Controllers.Api
sourceIds.AddRange(rectifyRecordIds); 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 else
{ {
safeNoticeId = check.ID; safeNoticeId = check.ID;
sourceIds.Add(check.ID); sourceIds.Add(check.ID);
safeRecordIds = GetEntities<T_SK_SECURITY_INSPECTION_RECORD>(e => e.SECURITY_INSPECTION_NOTICE_ID != null && e.SECURITY_INSPECTION_NOTICE_ID == check.ID, filter).Select(m=>m.ID).ToList(); safeRecords = GetEntities<T_SK_SECURITY_INSPECTION_RECORD>(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); sourceIds.AddRange(safeRecordIds);
var recordSum= GetEntity<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY>(e => e.SECURITY_INSPECTION_NOTICE_ID != null && e.SECURITY_INSPECTION_NOTICE_ID == check.ID); recordSum= GetEntity<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY>(e => e.SECURITY_INSPECTION_NOTICE_ID != null && e.SECURITY_INSPECTION_NOTICE_ID == check.ID);
if (recordSum != null) if (recordSum != null)
{ {
safeRecordSumId = recordSum.ID; safeRecordSumId = recordSum.ID;
@ -1729,7 +1735,8 @@ namespace APT.SK.WebApi.Controllers.Api
{ {
dangerReportId = dangerReport.ID; dangerReportId = dangerReport.ID;
sourceIds.Add(dangerReport.ID); sourceIds.Add(dangerReport.ID);
rectifyNoticeIds = GetEntities<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE>(e => e.HIDDEN_DANGER_REPORT_ID != null && e.HIDDEN_DANGER_REPORT_ID == dangerReport.ID,filter).Select(t=>t.ID).ToList(); rectifyNotices = GetEntities<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE>(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()) if (rectifyNoticeIds != null && rectifyNoticeIds.Any())
{ {
sourceIds.AddRange(rectifyNoticeIds); 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; return result;
} }
}); });
} }
private void GetAutoNext(List<Guid> 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<Guid> safeRecordIds, Guid? safeRecordSumId, Guid? dangerReportId, T_SK_HIDDEN_DANGER_REPORT dangerReport, List<Guid> rectifyNoticeIds, List<Guid> rectifyRecordIds, List<T_SK_HIDDEN_DANGER_RECTIFY_RECORD> rectifyRecords, ref List<OperateLog> result) private void GetAutoNext(List<Guid> 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<Guid> safeRecordIds, List<T_SK_SECURITY_INSPECTION_RECORD> safeRecords, Guid? safeRecordSumId, T_SK_SECURITY_INSPECTION_RECORD_SUMMARY recordSum, Guid? dangerReportId, T_SK_HIDDEN_DANGER_REPORT dangerReport, List<Guid> rectifyNoticeIds, List<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE> rectifyNotices,List<Guid> rectifyRecordIds, List<T_SK_HIDDEN_DANGER_RECTIFY_RECORD> rectifyRecords, ref List<OperateLog> result)
{ {
var approveIds = new List<Guid>(); var approveIds = new List<Guid>();
var approves = new List<T_PF_APPROVE>(); var approves = new List<T_PF_APPROVE>();
@ -1908,6 +1915,33 @@ namespace APT.SK.WebApi.Controllers.Api
start1.STATUS = 0; start1.STATUS = 0;
noticeLog.logList.Add(start1); 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); result.Add(noticeLog);
#endregion #endregion
@ -1935,6 +1969,36 @@ namespace APT.SK.WebApi.Controllers.Api
start.CREATE_TIME = temp1.CREATE_TIME; 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; 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); 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(); var temp3 = itemps.Where(t => t.NOTICE_STATUS != 1).OrderByDescending(n => n.NOTICE_STATUS).ThenBy(m => m.MODIFY_TIME).ToList();
@ -1951,7 +2015,60 @@ namespace APT.SK.WebApi.Controllers.Api
start.CREATE_TIME = temp1.CREATE_TIME; 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; 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); 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
{
OperateLogList start1 = new OperateLogList();
start1.ID = null;
start1.CODE = "SK010_SHOWPRINT";
start1.USER_NAME = "检查人";
start1.NAME = "安全检查记录";
start1.DEAL_DATE = null;
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 else
@ -1965,19 +2082,15 @@ namespace APT.SK.WebApi.Controllers.Api
start1.CREATE_TIME = null; start1.CREATE_TIME = null;
start1.STATUS = 0; start1.STATUS = 0;
recordLog.logList.Add(start1); recordLog.logList.Add(start1);
} OperateLogList start2 = new OperateLogList();
} start2.ID = null;
else start2.CODE = "SK010_SHOWPRINT";
{ start2.USER_NAME = "检查人";
OperateLogList start1 = new OperateLogList(); start2.NAME = "安全检查记录归档";
start1.ID = null; start2.DEAL_DATE = null;
start1.CODE = "SK010_SHOWPRINT"; start2.CREATE_TIME = null;
start1.USER_NAME = "检查人"; start2.STATUS = 0;
start1.NAME = "安全检查记录"; recordLog.logList.Add(start2);
start1.DEAL_DATE = null;
start1.CREATE_TIME = null;
start1.STATUS = 0;
recordLog.logList.Add(start1);
} }
result.Add(recordLog); result.Add(recordLog);
#endregion #endregion
@ -2016,6 +2129,32 @@ namespace APT.SK.WebApi.Controllers.Api
start1.CREATE_TIME = item.CREATE_TIME; 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; 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); 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(); 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.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; 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); 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.CREATE_TIME = null;
start1.STATUS = 0; start1.STATUS = 0;
recordSumLog.logList.Add(start1); 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 else
@ -2068,6 +2241,15 @@ namespace APT.SK.WebApi.Controllers.Api
start1.CREATE_TIME = null; start1.CREATE_TIME = null;
start1.STATUS = 0; start1.STATUS = 0;
recordSumLog.logList.Add(start1); 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); result.Add(recordSumLog);
#endregion #endregion
@ -2211,6 +2393,40 @@ namespace APT.SK.WebApi.Controllers.Api
start1.CREATE_TIME = null; start1.CREATE_TIME = null;
start1.STATUS = 0; start1.STATUS = 0;
hiddenReportLog.logList.Add(start1); 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 else
@ -2242,6 +2458,15 @@ namespace APT.SK.WebApi.Controllers.Api
start1.CREATE_TIME = null; start1.CREATE_TIME = null;
start1.STATUS = 0; start1.STATUS = 0;
hiddenReportLog.logList.Add(start1); 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); result.Add(hiddenReportLog);
#endregion #endregion
@ -2259,9 +2484,19 @@ namespace APT.SK.WebApi.Controllers.Api
start.USER_NAME = handUser.NAME; start.USER_NAME = handUser.NAME;
start.NAME = "手动隐患上报"; start.NAME = "手动隐患上报";
start.DEAL_DATE = hand.STATUS == PFStandardStatus.Draft ? null : hand.MODIFY_TIME; 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; start.STATUS = hand.STATUS == PFStandardStatus.Draft ? 16 : 5;
handLog.logList.Add(start); 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 #endregion
#region 隐患确认单 #region 隐患确认单
OperateLog confirmLog = new OperateLog(); OperateLog confirmLog = new OperateLog();
@ -2382,6 +2617,16 @@ namespace APT.SK.WebApi.Controllers.Api
start2.STATUS = 0; start2.STATUS = 0;
confirmLog.logList.Add(start2); 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 else
{ {
@ -2412,6 +2657,15 @@ namespace APT.SK.WebApi.Controllers.Api
start3.CREATE_TIME = null; start3.CREATE_TIME = null;
start3.STATUS = 0; start3.STATUS = 0;
confirmLog.logList.Add(start3); 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 #endregion
} }
@ -2486,6 +2740,32 @@ namespace APT.SK.WebApi.Controllers.Api
start1.STATUS = 0; start1.STATUS = 0;
rectifyNoticeLog.logList.Add(start1); 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); result.Add(rectifyNoticeLog);
} }
} }
@ -2512,6 +2792,15 @@ namespace APT.SK.WebApi.Controllers.Api
start1.CREATE_TIME = null; start1.CREATE_TIME = null;
start1.STATUS = 0; start1.STATUS = 0;
rectifyNoticeLog.logList.Add(start1); 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); result.Add(rectifyNoticeLog);
} }
} }
@ -2538,6 +2827,15 @@ namespace APT.SK.WebApi.Controllers.Api
start1.CREATE_TIME = null; start1.CREATE_TIME = null;
start1.STATUS = 0; start1.STATUS = 0;
rectifyNoticeLog.logList.Add(start1); 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); result.Add(rectifyNoticeLog);
} }
#endregion #endregion
@ -2644,41 +2942,32 @@ namespace APT.SK.WebApi.Controllers.Api
} }
} }
} }
result.Add(refRecordLog); //归档
} 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 else
{ {
OperateLog refRecordLog = new OperateLog();
refRecordLog.FORM_NAME = "隐患整改通知";
refRecordLog.logList = new List<OperateLogList>();
OperateLogList start = new OperateLogList();
start.ID = null;
start.CODE = "SK022_SHOWPRINT";
start.USER_NAME = "整改落实人";
start.NAME = "隐患整改记录";
start.DEAL_DATE = null;
start.CREATE_TIME = null;
start.STATUS = 0;
refRecordLog.logList.Add(start);
OperateLogList start1 = new OperateLogList(); OperateLogList start1 = new OperateLogList();
start1.ID = null; start1.ID = temp1.SOURCE_DATA_ID;
start1.CODE = "SK022_SHOWPRINT"; start1.CODE = "SK022_SHOWPRINT";
start1.USER_NAME = "验收人"; start1.USER_NAME = temp1.USER_NAME;
start1.NAME = "隐患整改记录验收"; start1.NAME = "隐患整改记录归档";
start1.DEAL_DATE = null; start1.DEAL_DATE = rectifyRecord.MODIFY_TIME;
start1.CREATE_TIME = null; start1.CREATE_TIME = rectifyRecord.CREATE_TIME;
start1.STATUS = 0; start1.STATUS = 0;
refRecordLog.logList.Add(start1); refRecordLog.logList.Add(start1);
OperateLogList start2 = new OperateLogList(); }
start2.ID = null;
start2.CODE = "SK022_SHOWPRINT";
start2.USER_NAME = "审批人";
start2.NAME = "隐患整改记录审批";
start2.DEAL_DATE = null;
start2.CREATE_TIME = null;
start2.STATUS = 0;
refRecordLog.logList.Add(start2);
result.Add(refRecordLog); result.Add(refRecordLog);
} }
} }
@ -2714,6 +3003,59 @@ namespace APT.SK.WebApi.Controllers.Api
start2.CREATE_TIME = null; start2.CREATE_TIME = null;
start2.STATUS = 0; start2.STATUS = 0;
refRecordLog.logList.Add(start2); 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);
}
}
else
{
OperateLog refRecordLog = new OperateLog();
refRecordLog.FORM_NAME = "隐患整改记录";
refRecordLog.logList = new List<OperateLogList>();
OperateLogList start = new OperateLogList();
start.ID = null;
start.CODE = "SK022_SHOWPRINT";
start.USER_NAME = "整改落实人";
start.NAME = "隐患整改记录";
start.DEAL_DATE = null;
start.CREATE_TIME = null;
start.STATUS = 0;
refRecordLog.logList.Add(start);
OperateLogList start1 = new OperateLogList();
start1.ID = null;
start1.CODE = "SK022_SHOWPRINT";
start1.USER_NAME = "验收人";
start1.NAME = "隐患整改记录验收";
start1.DEAL_DATE = null;
start1.CREATE_TIME = null;
start1.STATUS = 0;
refRecordLog.logList.Add(start1);
OperateLogList start2 = new OperateLogList();
start2.ID = null;
start2.CODE = "SK022_SHOWPRINT";
start2.USER_NAME = "审批人";
start2.NAME = "隐患整改记录审批";
start2.DEAL_DATE = null;
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); result.Add(refRecordLog);
} }
#endregion #endregion