风险检查关联表查看,检查通知全流程可视化
This commit is contained in:
parent
ef691c2d53
commit
07d58bc0eb
@ -441,7 +441,7 @@ namespace APT.SK.WebApi.Controllers.Api
|
|||||||
{
|
{
|
||||||
var detailIds = details.Select(t => t.ID).ToList();
|
var detailIds = details.Select(t => t.ID).ToList();
|
||||||
var departs = this.GetEntities<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_DEPART>(t => detailIds.Contains(t.DOUBLE_PREVENT_MECHANISM_DETAIL_ID), new BaseFilter(filter.OrgId), "Nav_Department", "Nav_DepartDetails.Nav_Post");
|
var departs = this.GetEntities<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_DEPART>(t => detailIds.Contains(t.DOUBLE_PREVENT_MECHANISM_DETAIL_ID), new BaseFilter(filter.OrgId), "Nav_Department", "Nav_DepartDetails.Nav_Post");
|
||||||
var posts = this.GetEntities<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_POST>(t => detailIds.Contains(t.DOUBLE_PREVENT_MECHANISM_DETAIL_ID), new BaseFilter(filter.OrgId), "Nav_Department", "Nav_User");
|
var posts = this.GetEntities<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_POST>(t => detailIds.Contains(t.DOUBLE_PREVENT_MECHANISM_DETAIL_ID), new BaseFilter(filter.OrgId), "Nav_Department.Nav_User");
|
||||||
var measures = this.GetEntities<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES>(t => detailIds.Contains(t.DOUBLE_PREVENT_MECHANISM_DETAIL_ID), new BaseFilter(filter.OrgId));
|
var measures = this.GetEntities<T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL_MEASURES>(t => detailIds.Contains(t.DOUBLE_PREVENT_MECHANISM_DETAIL_ID), new BaseFilter(filter.OrgId));
|
||||||
//, "Nav_DetailMeasureContents.Nav_DetailMeasureContentBasics.Nav_Law",
|
//, "Nav_DetailMeasureContents.Nav_DetailMeasureContentBasics.Nav_Law",
|
||||||
// "Nav_DetailMeasureContents.Nav_Contents", "Nav_DetailMeasureContents.Nav_DetailMeasureContentPosts.Nav_Department",
|
// "Nav_DetailMeasureContents.Nav_Contents", "Nav_DetailMeasureContents.Nav_DetailMeasureContentPosts.Nav_Department",
|
||||||
|
|||||||
@ -1831,7 +1831,7 @@ namespace APT.SK.WebApi.Controllers.Api
|
|||||||
start.CODE = "SK006_SHOWPRINT";
|
start.CODE = "SK006_SHOWPRINT";
|
||||||
start.USER_NAME = checkUser.NAME;
|
start.USER_NAME = checkUser.NAME;
|
||||||
start.NAME = "安全检查通知";
|
start.NAME = "安全检查通知";
|
||||||
start.DEAL_DATE = check.STATUS == PFStandardStatus.Draft ? null : check.MODIFY_TIME;
|
start.DEAL_DATE = check.STATUS == PFStandardStatus.Draft ? null : check.CREATE_TIME;
|
||||||
start.CREATE_TIME = check.CREATE_TIME;
|
start.CREATE_TIME = check.CREATE_TIME;
|
||||||
start.STATUS = check.STATUS == PFStandardStatus.Close ? 15 : check.STATUS == PFStandardStatus.Draft ? 0 : 5;
|
start.STATUS = check.STATUS == PFStandardStatus.Close ? 15 : check.STATUS == PFStandardStatus.Draft ? 0 : 5;
|
||||||
noticeLog.logList.Add(start);
|
noticeLog.logList.Add(start);
|
||||||
@ -1908,7 +1908,7 @@ namespace APT.SK.WebApi.Controllers.Api
|
|||||||
start1.CODE = "SK006_SHOWPRINT";
|
start1.CODE = "SK006_SHOWPRINT";
|
||||||
start1.USER_NAME = item.USER_NAME;
|
start1.USER_NAME = item.USER_NAME;
|
||||||
start1.NAME = "安全检查通知确认";
|
start1.NAME = "安全检查通知确认";
|
||||||
start1.DEAL_DATE = item.NOTICE_STATUS == 4 ? item.MODIFY_TIME : item.TASK_DT;
|
start1.DEAL_DATE = item.NOTICE_STATUS == 4 ? item.MODIFY_TIME : (item.TASK_DT == DateTime.MinValue ? item.MODIFY_TIME : item.TASK_DT);
|
||||||
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;
|
||||||
noticeLog.logList.Add(start1);
|
noticeLog.logList.Add(start1);
|
||||||
@ -1924,7 +1924,7 @@ namespace APT.SK.WebApi.Controllers.Api
|
|||||||
start1.CODE = "SK006_SHOWPRINT";
|
start1.CODE = "SK006_SHOWPRINT";
|
||||||
start1.USER_NAME = item.USER_NAME;
|
start1.USER_NAME = item.USER_NAME;
|
||||||
start1.NAME = "安全检查通知确认";
|
start1.NAME = "安全检查通知确认";
|
||||||
start1.DEAL_DATE = item.NOTICE_STATUS == 4 ? item.MODIFY_TIME : item.TASK_DT;
|
start1.DEAL_DATE = item.NOTICE_STATUS == 4 ? item.MODIFY_TIME : (item.TASK_DT == DateTime.MinValue ? item.MODIFY_TIME : item.TASK_DT);
|
||||||
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;
|
||||||
noticeLog.logList.Add(start1);
|
noticeLog.logList.Add(start1);
|
||||||
@ -1997,37 +1997,37 @@ 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);
|
//var record = safeRecords.FirstOrDefault(t => t.ID == temp1.SOURCE_DATA_ID);
|
||||||
if (record != null)
|
//if (record != null)
|
||||||
{
|
//{
|
||||||
var recordUser = users.FirstOrDefault(t => t.ID == record.APPLY_USER_ID);
|
// var recordUser = users.FirstOrDefault(t => t.ID == record.APPLY_USER_ID);
|
||||||
//归档
|
// //归档
|
||||||
if (record.STATUS == PFStandardStatus.Archived || record.STATUS == PFStandardStatus.Close)
|
// if (record.STATUS == PFStandardStatus.Archived || record.STATUS == PFStandardStatus.Close)
|
||||||
{
|
// {
|
||||||
OperateLogList start1 = new OperateLogList();
|
// OperateLogList start1 = new OperateLogList();
|
||||||
start1.ID = temp1.SOURCE_DATA_ID;
|
// start1.ID = temp1.SOURCE_DATA_ID;
|
||||||
start1.CODE = "SK010_SHOWPRINT";
|
// start1.CODE = "SK010_SHOWPRINT";
|
||||||
start1.USER_NAME = recordUser.NAME;
|
// start1.USER_NAME = recordUser.NAME;
|
||||||
start1.NAME = "安全检查记录归档";
|
// start1.NAME = "安全检查记录归档";
|
||||||
start1.DEAL_DATE = record.MODIFY_TIME;
|
// start1.DEAL_DATE = record.MODIFY_TIME;
|
||||||
start1.CREATE_TIME = record.CREATE_TIME;
|
// start1.CREATE_TIME = record.CREATE_TIME;
|
||||||
start1.STATUS = 5;
|
// start1.STATUS = 5;
|
||||||
recordLog.logList.Add(start1);
|
// recordLog.logList.Add(start1);
|
||||||
|
|
||||||
}
|
// }
|
||||||
else
|
// else
|
||||||
{
|
// {
|
||||||
OperateLogList start1 = new OperateLogList();
|
// OperateLogList start1 = new OperateLogList();
|
||||||
start1.ID = temp1.SOURCE_DATA_ID;
|
// start1.ID = temp1.SOURCE_DATA_ID;
|
||||||
start1.CODE = "SK010_SHOWPRINT";
|
// start1.CODE = "SK010_SHOWPRINT";
|
||||||
start1.USER_NAME = recordUser.NAME;
|
// start1.USER_NAME = recordUser.NAME;
|
||||||
start1.NAME = "安全检查记录归档";
|
// start1.NAME = "安全检查记录归档";
|
||||||
start1.DEAL_DATE = record.MODIFY_TIME;
|
// start1.DEAL_DATE = record.MODIFY_TIME;
|
||||||
start1.CREATE_TIME = record.CREATE_TIME;
|
// start1.CREATE_TIME = record.CREATE_TIME;
|
||||||
start1.STATUS = 0;
|
// start1.STATUS = 0;
|
||||||
recordLog.logList.Add(start1);
|
// 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();
|
||||||
@ -2044,37 +2044,37 @@ 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);
|
//var record = safeRecords.FirstOrDefault(t => t.ID == temp1.SOURCE_DATA_ID);
|
||||||
if (record != null)
|
//if (record != null)
|
||||||
{
|
//{
|
||||||
var recordUser = users.FirstOrDefault(t => t.ID == record.APPLY_USER_ID);
|
// var recordUser = users.FirstOrDefault(t => t.ID == record.APPLY_USER_ID);
|
||||||
//归档
|
// //归档
|
||||||
if (record.STATUS == PFStandardStatus.Archived || record.STATUS == PFStandardStatus.Close)
|
// if (record.STATUS == PFStandardStatus.Archived || record.STATUS == PFStandardStatus.Close)
|
||||||
{
|
// {
|
||||||
OperateLogList start1 = new OperateLogList();
|
// OperateLogList start1 = new OperateLogList();
|
||||||
start1.ID = temp1.SOURCE_DATA_ID;
|
// start1.ID = temp1.SOURCE_DATA_ID;
|
||||||
start1.CODE = "SK010_SHOWPRINT";
|
// start1.CODE = "SK010_SHOWPRINT";
|
||||||
start1.USER_NAME = recordUser.NAME;
|
// start1.USER_NAME = recordUser.NAME;
|
||||||
start1.NAME = "安全检查记录归档";
|
// start1.NAME = "安全检查记录归档";
|
||||||
start1.DEAL_DATE = record.MODIFY_TIME;
|
// start1.DEAL_DATE = record.MODIFY_TIME;
|
||||||
start1.CREATE_TIME = record.CREATE_TIME;
|
// start1.CREATE_TIME = record.CREATE_TIME;
|
||||||
start1.STATUS = 5;
|
// start1.STATUS = 5;
|
||||||
recordLog.logList.Add(start1);
|
// recordLog.logList.Add(start1);
|
||||||
|
|
||||||
}
|
// }
|
||||||
else
|
// else
|
||||||
{
|
// {
|
||||||
OperateLogList start1 = new OperateLogList();
|
// OperateLogList start1 = new OperateLogList();
|
||||||
start1.ID = temp1.SOURCE_DATA_ID;
|
// start1.ID = temp1.SOURCE_DATA_ID;
|
||||||
start1.CODE = "SK010_SHOWPRINT";
|
// start1.CODE = "SK010_SHOWPRINT";
|
||||||
start1.USER_NAME = recordUser.NAME;
|
// start1.USER_NAME = recordUser.NAME;
|
||||||
start1.NAME = "安全检查记录归档";
|
// start1.NAME = "安全检查记录归档";
|
||||||
start1.DEAL_DATE = record.MODIFY_TIME;
|
// start1.DEAL_DATE = record.MODIFY_TIME;
|
||||||
start1.CREATE_TIME = record.CREATE_TIME;
|
// start1.CREATE_TIME = record.CREATE_TIME;
|
||||||
start1.STATUS = 0;
|
// start1.STATUS = 0;
|
||||||
recordLog.logList.Add(start1);
|
// recordLog.logList.Add(start1);
|
||||||
}
|
// }
|
||||||
}
|
//}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2160,32 +2160,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)
|
//if (recordSum.STATUS == PFStandardStatus.Archived)
|
||||||
{
|
//{
|
||||||
OperateLogList start2 = new OperateLogList();
|
// OperateLogList start2 = new OperateLogList();
|
||||||
start2.ID = safeRecordSumId;
|
// start2.ID = safeRecordSumId;
|
||||||
start2.CODE = "SK012_SHOWPRINT";
|
// start2.CODE = "SK012_SHOWPRINT";
|
||||||
start2.USER_NAME = recordSumUser.NAME;
|
// start2.USER_NAME = recordSumUser.NAME;
|
||||||
start2.NAME = "安全检查记录汇总归档";
|
// start2.NAME = "安全检查记录汇总归档";
|
||||||
start2.DEAL_DATE = recordSum.MODIFY_TIME;
|
// start2.DEAL_DATE = recordSum.MODIFY_TIME;
|
||||||
start2.CREATE_TIME = recordSum.CREATE_TIME;
|
// start2.CREATE_TIME = recordSum.CREATE_TIME;
|
||||||
start2.STATUS = 5;
|
// start2.STATUS = 5;
|
||||||
recordSumLog.logList.Add(start2);
|
// recordSumLog.logList.Add(start2);
|
||||||
|
|
||||||
}
|
//}
|
||||||
else
|
//else
|
||||||
{
|
//{
|
||||||
OperateLogList start2 = new OperateLogList();
|
// OperateLogList start2 = new OperateLogList();
|
||||||
start2.ID = safeRecordSumId;
|
// start2.ID = safeRecordSumId;
|
||||||
start2.CODE = "SK012_SHOWPRINT";
|
// start2.CODE = "SK012_SHOWPRINT";
|
||||||
start2.USER_NAME = recordSumUser.NAME;
|
// start2.USER_NAME = recordSumUser.NAME;
|
||||||
start2.NAME = "安全检查记录汇总归档";
|
// start2.NAME = "安全检查记录汇总归档";
|
||||||
start2.DEAL_DATE = recordSum.MODIFY_TIME;
|
// start2.DEAL_DATE = recordSum.MODIFY_TIME;
|
||||||
start2.CREATE_TIME = recordSum.CREATE_TIME;
|
// start2.CREATE_TIME = recordSum.CREATE_TIME;
|
||||||
start2.STATUS = 0;
|
// start2.STATUS = 0;
|
||||||
recordSumLog.logList.Add(start2);
|
// 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();
|
||||||
@ -2203,30 +2203,30 @@ namespace APT.SK.WebApi.Controllers.Api
|
|||||||
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)
|
//if (recordSum.STATUS == PFStandardStatus.Archived)
|
||||||
{
|
//{
|
||||||
OperateLogList start2 = new OperateLogList();
|
// OperateLogList start2 = new OperateLogList();
|
||||||
start2.ID = safeRecordSumId;
|
// start2.ID = safeRecordSumId;
|
||||||
start2.CODE = "SK012_SHOWPRINT";
|
// start2.CODE = "SK012_SHOWPRINT";
|
||||||
start2.USER_NAME = recordSumUser.NAME;
|
// start2.USER_NAME = recordSumUser.NAME;
|
||||||
start2.NAME = "安全检查记录汇总归档";
|
// start2.NAME = "安全检查记录汇总归档";
|
||||||
start2.DEAL_DATE = recordSum.MODIFY_TIME;
|
// start2.DEAL_DATE = recordSum.MODIFY_TIME;
|
||||||
start2.CREATE_TIME = recordSum.CREATE_TIME;
|
// start2.CREATE_TIME = recordSum.CREATE_TIME;
|
||||||
start2.STATUS = 5;
|
// start2.STATUS = 5;
|
||||||
recordSumLog.logList.Add(start2);
|
// recordSumLog.logList.Add(start2);
|
||||||
}
|
//}
|
||||||
else
|
//else
|
||||||
{
|
//{
|
||||||
OperateLogList start2 = new OperateLogList();
|
// OperateLogList start2 = new OperateLogList();
|
||||||
start2.ID = safeRecordSumId;
|
// start2.ID = safeRecordSumId;
|
||||||
start2.CODE = "SK012_SHOWPRINT";
|
// start2.CODE = "SK012_SHOWPRINT";
|
||||||
start2.USER_NAME = recordSumUser.NAME;
|
// start2.USER_NAME = recordSumUser.NAME;
|
||||||
start2.NAME = "安全检查记录汇总归档";
|
// start2.NAME = "安全检查记录汇总归档";
|
||||||
start2.DEAL_DATE = recordSum.MODIFY_TIME;
|
// start2.DEAL_DATE = recordSum.MODIFY_TIME;
|
||||||
start2.CREATE_TIME = recordSum.CREATE_TIME;
|
// start2.CREATE_TIME = recordSum.CREATE_TIME;
|
||||||
start2.STATUS = 0;
|
// start2.STATUS = 0;
|
||||||
recordSumLog.logList.Add(start2);
|
// recordSumLog.logList.Add(start2);
|
||||||
}
|
//}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -2241,6 +2241,31 @@ 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);
|
||||||
|
}
|
||||||
|
//归档
|
||||||
|
if (recordSum.STATUS == PFStandardStatus.Archived)
|
||||||
|
{
|
||||||
|
OperateLogList start2 = new OperateLogList();
|
||||||
|
start2.ID = safeRecordSumId;
|
||||||
|
start2.CODE = "SK012_SHOWPRINT";
|
||||||
|
start2.USER_NAME = recordSumUser.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();
|
OperateLogList start2 = new OperateLogList();
|
||||||
start2.ID = null;
|
start2.ID = null;
|
||||||
start2.CODE = "SK012_SHOWPRINT";
|
start2.CODE = "SK012_SHOWPRINT";
|
||||||
@ -2427,7 +2452,7 @@ namespace APT.SK.WebApi.Controllers.Api
|
|||||||
OperateLogList start3 = new OperateLogList();
|
OperateLogList start3 = new OperateLogList();
|
||||||
start3.ID = null;
|
start3.ID = null;
|
||||||
start3.CODE = "SK014_SHOWPRINT";
|
start3.CODE = "SK014_SHOWPRINT";
|
||||||
start3.USER_NAME = "整改责任人";
|
start3.USER_NAME = "上报人";
|
||||||
start3.NAME = "隐患上报归档";
|
start3.NAME = "隐患上报归档";
|
||||||
start3.DEAL_DATE = null;
|
start3.DEAL_DATE = null;
|
||||||
start3.CREATE_TIME = null;
|
start3.CREATE_TIME = null;
|
||||||
@ -2493,7 +2518,7 @@ namespace APT.SK.WebApi.Controllers.Api
|
|||||||
OperateLogList start3 = new OperateLogList();
|
OperateLogList start3 = new OperateLogList();
|
||||||
start3.ID = null;
|
start3.ID = null;
|
||||||
start3.CODE = "SK014_SHOWPRINT";
|
start3.CODE = "SK014_SHOWPRINT";
|
||||||
start3.USER_NAME = "整改责任人";
|
start3.USER_NAME = "上报人";
|
||||||
start3.NAME = "隐患上报归档";
|
start3.NAME = "隐患上报归档";
|
||||||
start3.DEAL_DATE = null;
|
start3.DEAL_DATE = null;
|
||||||
start3.CREATE_TIME = null;
|
start3.CREATE_TIME = null;
|
||||||
@ -2766,7 +2791,7 @@ namespace APT.SK.WebApi.Controllers.Api
|
|||||||
OperateLogList start1 = new OperateLogList();
|
OperateLogList start1 = new OperateLogList();
|
||||||
start1.ID = null;
|
start1.ID = null;
|
||||||
start1.CODE = "SK020_SHOWPRINT";
|
start1.CODE = "SK020_SHOWPRINT";
|
||||||
start1.USER_NAME = "整改责任人";
|
start1.USER_NAME = "验收人";
|
||||||
start1.NAME = "隐患整改通知确认";
|
start1.NAME = "隐患整改通知确认";
|
||||||
start1.DEAL_DATE = null;
|
start1.DEAL_DATE = null;
|
||||||
start1.CREATE_TIME = null;
|
start1.CREATE_TIME = null;
|
||||||
@ -2820,7 +2845,7 @@ namespace APT.SK.WebApi.Controllers.Api
|
|||||||
OperateLogList start1 = new OperateLogList();
|
OperateLogList start1 = new OperateLogList();
|
||||||
start1.ID = null;
|
start1.ID = null;
|
||||||
start1.CODE = "SK020_SHOWPRINT";
|
start1.CODE = "SK020_SHOWPRINT";
|
||||||
start1.USER_NAME = "整改责任人";
|
start1.USER_NAME = "验收人";
|
||||||
start1.NAME = "隐患整改通知确认";
|
start1.NAME = "隐患整改通知确认";
|
||||||
start1.DEAL_DATE = null;
|
start1.DEAL_DATE = null;
|
||||||
start1.CREATE_TIME = null;
|
start1.CREATE_TIME = null;
|
||||||
@ -2855,7 +2880,7 @@ namespace APT.SK.WebApi.Controllers.Api
|
|||||||
OperateLogList start1 = new OperateLogList();
|
OperateLogList start1 = new OperateLogList();
|
||||||
start1.ID = null;
|
start1.ID = null;
|
||||||
start1.CODE = "SK020_SHOWPRINT";
|
start1.CODE = "SK020_SHOWPRINT";
|
||||||
start1.USER_NAME = "整改责任人";
|
start1.USER_NAME = "验收人";
|
||||||
start1.NAME = "隐患整改通知确认";
|
start1.NAME = "隐患整改通知确认";
|
||||||
start1.DEAL_DATE = null;
|
start1.DEAL_DATE = null;
|
||||||
start1.CREATE_TIME = null;
|
start1.CREATE_TIME = null;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user