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:
何美荣 2025-11-19 17:20:24 +08:00
parent 515ee29740
commit 2b13187238
1 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1667,7 +1667,6 @@ namespace APT.SK.WebApi.Controllers.Api
Guid? dangerReportId = null; Guid? dangerReportId = null;
Guid? rectifyNoticeId = null; Guid? rectifyNoticeId = null;
List<Guid> rectifyRecordIds = new List<Guid>(); List<Guid> rectifyRecordIds = new List<Guid>();
List<Guid> hidRectifyRecordIds = new List<Guid>();
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);
if (check == null) if (check == null)
@ -1681,7 +1680,7 @@ namespace APT.SK.WebApi.Controllers.Api
safeNoticeId = check.ID; safeNoticeId = check.ID;
sourceIds.Add(check.ID); sourceIds.Add(check.ID);
T_SK_HIDDEN_DANGER_REPORT dangerReport = null; T_SK_HIDDEN_DANGER_REPORT dangerReport = null;
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>();
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(); 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();
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); var recordSum= GetEntity<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY>(e => e.SECURITY_INSPECTION_NOTICE_ID != null && e.SECURITY_INSPECTION_NOTICE_ID == check.ID);
@ -1718,11 +1717,6 @@ namespace APT.SK.WebApi.Controllers.Api
approves = GetEntities<T_PF_APPROVE>(e => sourceIds.Contains(e.DATA_ID), null, null).ToList(); approves = GetEntities<T_PF_APPROVE>(e => sourceIds.Contains(e.DATA_ID), null, null).ToList();
approveIds = approves.Select(m => m.ID).ToList(); approveIds = approves.Select(m => m.ID).ToList();
} }
var approveDetails = new List<T_PF_APPROVE_DETAIL>();
if (approveIds != null && approveIds.Any())
{
approveDetails = GetEntities<T_PF_APPROVE_DETAIL>(e => approveIds.Contains(e.APPROVE_ID), new BaseFilter(check.ORG_ID), null).ToList();
}
var tasks = GetEntities<T_FM_NOTIFICATION_TASK>(e => e.SOURCE_DATA_ID != null && (sourceIds.Contains(e.SOURCE_DATA_ID.Value) || approveIds.Contains(e.SOURCE_DATA_ID.Value)), null, null).OrderBy(t => t.CREATE_TIME).ThenBy(m=>m.MODIFY_TIME).ToList(); var tasks = GetEntities<T_FM_NOTIFICATION_TASK>(e => e.SOURCE_DATA_ID != null && (sourceIds.Contains(e.SOURCE_DATA_ID.Value) || approveIds.Contains(e.SOURCE_DATA_ID.Value)), null, null).OrderBy(t => t.CREATE_TIME).ThenBy(m=>m.MODIFY_TIME).ToList();
var users = GetEntities<T_FM_USER>(e => e.ENABLE_STATUS == 0, new BaseFilter(check.ORG_ID), null).ToList(); var users = GetEntities<T_FM_USER>(e => e.ENABLE_STATUS == 0, new BaseFilter(check.ORG_ID), null).ToList();
var checkUser = users.FirstOrDefault(t => t.ID == check.APPLY_USER_ID); var checkUser = users.FirstOrDefault(t => t.ID == check.APPLY_USER_ID);
@ -1741,7 +1735,7 @@ namespace APT.SK.WebApi.Controllers.Api
{ {
OperateLogList start = new OperateLogList(); OperateLogList start = new OperateLogList();
start.USER_NAME = temp1.USER_NAME; start.USER_NAME = temp1.USER_NAME;
start.NAME = "安全检查通知"; start.NAME =temp1.NOTICE_STATUS==4? "安全检查通知(系统归档)" : "安全检查通知";
start.DEAL_DATE = temp1.TASK_DT; start.DEAL_DATE = temp1.TASK_DT;
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 : 0; start.STATUS = temp1.NOTICE_STATUS == 1 ? 5 : temp1.NOTICE_STATUS == 2 ? 10 : temp1.NOTICE_STATUS == 4 ? 15 : 0;
@ -1752,10 +1746,10 @@ namespace APT.SK.WebApi.Controllers.Api
//手动发起的检查通知 //手动发起的检查通知
OperateLogList start = new OperateLogList(); OperateLogList start = new OperateLogList();
start.USER_NAME = checkUser.NAME; start.USER_NAME = checkUser.NAME;
start.NAME = "安全检查通知"; start.NAME = check.STATUS == PFStandardStatus.Close? "安全检查通知(系统归档)" : "安全检查通知";
start.DEAL_DATE = check.STATUS == PFStandardStatus.Draft ? null:check.MODIFY_TIME; start.DEAL_DATE = check.STATUS == PFStandardStatus.Draft ? null:check.MODIFY_TIME;
start.CREATE_TIME = check.CREATE_TIME; start.CREATE_TIME = check.CREATE_TIME;
start.STATUS = check.STATUS == PFStandardStatus.Draft? 0 : 10; start.STATUS = check.STATUS == PFStandardStatus.Close? 15 :check.STATUS == PFStandardStatus.Draft? 0 : 5;
noticeLog.logList.Add(start); noticeLog.logList.Add(start);
} }
//审批 //审批
@ -1796,7 +1790,7 @@ namespace APT.SK.WebApi.Controllers.Api
} }
else else
{ {
var tempApprove = tasks.Where(t => t.SOURCE_DATA_ID == approveTemp.ID).OrderBy(t => t.CREATE_TIME).ThenBy(m=>m.MODIFY_TIME).ToList(); var tempApprove = tasks.Where(t => t.SOURCE_DATA_ID == approveTemp.ID).OrderBy(t => t.MODIFY_TIME).ThenBy(m=>m.CREATE_TIME).ToList();
if (tempApprove != null && tempApprove.Any()) if (tempApprove != null && tempApprove.Any())
{ {
foreach (var item in tempApprove) foreach (var item in tempApprove)
@ -1811,7 +1805,7 @@ namespace APT.SK.WebApi.Controllers.Api
} }
} }
} }
var temp2 = tasks.Where(t => t.SOURCE_DATA_ID == safeNoticeId && t.NOTICE_TITLE.Contains("确认")).OrderBy(m=>m.CREATE_TIME).ThenBy(n=>n.MODIFY_TIME).ToList(); var temp2 = tasks.Where(t => t.SOURCE_DATA_ID == safeNoticeId && t.NOTICE_TITLE.Contains("确认")).OrderBy(m=>m.MODIFY_TIME).ThenBy(n=>n.CREATE_TIME).ToList();
if (temp2 != null && temp2.Any()) if (temp2 != null && temp2.Any())
{ {
foreach (var item in temp2) foreach (var item in temp2)
@ -1845,14 +1839,14 @@ namespace APT.SK.WebApi.Controllers.Api
if (safeRecordIds != null && safeRecordIds.Any()) if (safeRecordIds != null && safeRecordIds.Any())
{ {
//发起 //发起
var itemps = tasks.Where(t => t.SOURCE_DATA_ID!=null && safeRecordIds.Contains((Guid)t.SOURCE_DATA_ID)).OrderBy(m=>m.CREATE_TIME).ThenBy(n=>n.MODIFY_TIME).ToList(); var itemps = tasks.Where(t => t.SOURCE_DATA_ID!=null && safeRecordIds.Contains((Guid)t.SOURCE_DATA_ID)).OrderBy(m=>m.MODIFY_TIME).ThenBy(n=>n.CREATE_TIME).ToList();
if (itemps != null && itemps.Any()) if (itemps != null && itemps.Any())
{ {
foreach (var temp1 in itemps) foreach (var temp1 in itemps)
{ {
OperateLogList start = new OperateLogList(); OperateLogList start = new OperateLogList();
start.USER_NAME = temp1.USER_NAME; start.USER_NAME = temp1.USER_NAME;
start.NAME = "安全检查记录"; start.NAME = temp1.NOTICE_STATUS== 4? "安全检查记录(系统归档)" : "安全检查记录";
start.DEAL_DATE = temp1.TASK_DT; start.DEAL_DATE = temp1.TASK_DT;
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 : 0; start.STATUS = temp1.NOTICE_STATUS == 1 ? 5 : temp1.NOTICE_STATUS == 2 ? 10 : temp1.NOTICE_STATUS == 4 ? 15 : 0;
@ -1898,7 +1892,7 @@ namespace APT.SK.WebApi.Controllers.Api
start.STATUS = temp1.NOTICE_STATUS == 1 ? 5 : temp1.NOTICE_STATUS == 2 ? 10 : temp1.NOTICE_STATUS == 4 ? 15 : 0; start.STATUS = temp1.NOTICE_STATUS == 1 ? 5 : temp1.NOTICE_STATUS == 2 ? 10 : temp1.NOTICE_STATUS == 4 ? 15 : 0;
recordSumLog.logList.Add(start); recordSumLog.logList.Add(start);
//确认 //确认
var temp2 = tasks.Where(t => t.SOURCE_DATA_ID == safeRecordSumId && t.NOTICE_TITLE.Contains("确认")).OrderBy(m => m.CREATE_TIME).ThenBy(n => n.MODIFY_TIME).ToList(); var temp2 = tasks.Where(t => t.SOURCE_DATA_ID == safeRecordSumId && t.NOTICE_TITLE.Contains("确认")).OrderBy(m => m.MODIFY_TIME).ThenBy(n => n.CREATE_TIME).ToList();
if (temp2 != null && temp2.Any()) if (temp2 != null && temp2.Any())
{ {
foreach (var item in temp2) foreach (var item in temp2)
@ -1993,7 +1987,7 @@ namespace APT.SK.WebApi.Controllers.Api
start1.DEAL_DATE = null; start1.DEAL_DATE = null;
start1.CREATE_TIME = null; start1.CREATE_TIME = null;
start1.STATUS = 0; start1.STATUS = 0;
noticeLog.logList.Add(start1); hiddenReportLog.logList.Add(start1);
} }
} }
else else
@ -2009,7 +2003,7 @@ namespace APT.SK.WebApi.Controllers.Api
} }
else else
{ {
var tempApprove = tasks.Where(t => t.SOURCE_DATA_ID == approveTemp.ID).OrderBy(t => t.CREATE_TIME).ThenBy(m => m.MODIFY_TIME).ToList(); var tempApprove = tasks.Where(t => t.SOURCE_DATA_ID == approveTemp.ID).OrderBy(t => t.MODIFY_TIME).ThenBy(m => m.CREATE_TIME).ToList();
if (tempApprove != null && tempApprove.Any()) if (tempApprove != null && tempApprove.Any())
{ {
foreach (var item in tempApprove) foreach (var item in tempApprove)
@ -2024,10 +2018,9 @@ namespace APT.SK.WebApi.Controllers.Api
} }
} }
} }
var temp2 = tasks.Where(t => t.SOURCE_DATA_ID == dangerReportId && t.NOTICE_TITLE.Contains("确认")).OrderBy(m=>m.CREATE_TIME).ThenBy(n=>n.MODIFY_TIME).ToList(); var temp2 = tasks.Where(t => t.SOURCE_DATA_ID == dangerReportId && t.NOTICE_TITLE.Contains("确认")).OrderBy(m=>m.MODIFY_TIME).ThenBy(n=>n.CREATE_TIME).ToList();
if (temp2 != null && temp2.Any()) if (temp2 != null && temp2.Any())
{ {
noticeLog.logList = new List<OperateLogList>();
foreach (var item in temp2) foreach (var item in temp2)
{ {
OperateLogList start1 = new OperateLogList(); OperateLogList start1 = new OperateLogList();
@ -2092,10 +2085,9 @@ 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 : 0; start.STATUS = temp1.NOTICE_STATUS == 1 ? 5 : temp1.NOTICE_STATUS == 2 ? 10 : temp1.NOTICE_STATUS == 4 ? 15 : 0;
rectifyNoticeLog.logList.Add(start); rectifyNoticeLog.logList.Add(start);
var temp2 = tasks.Where(t => t.SOURCE_DATA_ID == rectifyNoticeId && t.NOTICE_TITLE.Contains("确认")).OrderBy(m => m.CREATE_TIME).ThenBy(n => n.MODIFY_TIME).ToList(); var temp2 = tasks.Where(t => t.SOURCE_DATA_ID == rectifyNoticeId && t.NOTICE_TITLE.Contains("确认")).OrderBy(m => m.MODIFY_TIME).ThenBy(n => n.CREATE_TIME).ToList();
if (temp2 != null && temp2.Any()) if (temp2 != null && temp2.Any())
{ {
noticeLog.logList = new List<OperateLogList>();
foreach (var item in temp2) foreach (var item in temp2)
{ {
OperateLogList start1 = new OperateLogList(); OperateLogList start1 = new OperateLogList();
@ -2141,7 +2133,7 @@ namespace APT.SK.WebApi.Controllers.Api
if (rectifyRecordIds != null && rectifyRecordIds.Any()) if (rectifyRecordIds != null && rectifyRecordIds.Any())
{ {
//发起 //发起
var items = tasks.Where(t =>t.SOURCE_DATA_ID!=null && rectifyRecordIds.Contains((Guid)t.SOURCE_DATA_ID) && !t.NOTICE_TITLE.Contains("确认") && !t.NOTICE_TITLE.Contains("验收")).OrderBy(m=>m.CREATE_TIME).ThenBy(n=>n.MODIFY_TIME).ToList(); var items = tasks.Where(t =>t.SOURCE_DATA_ID!=null && rectifyRecordIds.Contains((Guid)t.SOURCE_DATA_ID) && !t.NOTICE_TITLE.Contains("确认") && !t.NOTICE_TITLE.Contains("验收")).OrderBy(m=>m.MODIFY_TIME).ThenBy(n=>n.CREATE_TIME).ToList();
if (items != null && items.Any()) if (items != null && items.Any())
{ {
foreach (var temp1 in items) foreach (var temp1 in items)
@ -2212,7 +2204,7 @@ namespace APT.SK.WebApi.Controllers.Api
} }
else else
{ {
var tempApprove = tasks.Where(t => t.SOURCE_DATA_ID == approveTemp.ID).OrderBy(t => t.CREATE_TIME).ThenBy(m => m.MODIFY_TIME).ToList(); var tempApprove = tasks.Where(t => t.SOURCE_DATA_ID == approveTemp.ID).OrderBy(t => t.MODIFY_TIME).ThenBy(m => m.CREATE_TIME).ToList();
if (tempApprove != null && tempApprove.Any()) if (tempApprove != null && tempApprove.Any())
{ {
foreach (var item in tempApprove) foreach (var item in tempApprove)