From 6144d0a50f82c9b74d7f97e3d56363521c970fa1 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: Wed, 19 Nov 2025 12:59:27 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=9A=90=E6=82=A3?= =?UTF-8?q?=E6=95=B4=E6=94=B9=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Api/SecurityInspectionNoticeController.cs | 246 +++++++++++++----- 1 file changed, 188 insertions(+), 58 deletions(-) diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionNoticeController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionNoticeController.cs index 39cfa24..751176a 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionNoticeController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionNoticeController.cs @@ -1653,6 +1653,7 @@ namespace APT.SK.WebApi.Controllers.Api { return SafeExecute>(() => { + filter.IgnoreDataRule = true; var result = new List(); if (string.IsNullOrEmpty(filter.Keyword)) { @@ -1665,6 +1666,7 @@ namespace APT.SK.WebApi.Controllers.Api Guid? safeRecordSumId = null; Guid? dangerReportId = null; Guid? rectifyNoticeId = null; + List rectifyRecordIds = new List(); List hidRectifyRecordIds = new List(); Guid Keyword = new Guid(filter.Keyword); var check = GetEntity(Keyword); @@ -1678,10 +1680,10 @@ namespace APT.SK.WebApi.Controllers.Api var sourceIds = new List(); safeNoticeId = check.ID; sourceIds.Add(check.ID); - T_SK_HIDDEN_DANGER_REPORT dangerReport = null; - var recordIds = GetEntities(e => e.SECURITY_INSPECTION_NOTICE_ID != null && e.SECURITY_INSPECTION_NOTICE_ID == check.ID,new BaseFilter(check.ORG_ID)).Select(m=>m.ID).ToList(); - sourceIds.AddRange(recordIds); - safeRecordIds.AddRange(recordIds); + T_SK_HIDDEN_DANGER_REPORT dangerReport = null; + List rectifyRecords = new List(); ; + safeRecordIds = GetEntities(e => e.SECURITY_INSPECTION_NOTICE_ID != null && e.SECURITY_INSPECTION_NOTICE_ID == check.ID, filter).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); if (recordSum != null) { @@ -1697,15 +1699,15 @@ namespace APT.SK.WebApi.Controllers.Api { rectifyNoticeId = rectifyNotice.ID; sourceIds.Add(rectifyNotice.ID); - var rectifyRecordIds = GetEntities(e => e.HIDDEN_DANGER_RECTIFY_NOTICE_ID != null && e.HIDDEN_DANGER_RECTIFY_NOTICE_ID == rectifyNotice.ID,new BaseFilter(dangerReport.ORG_ID)).Select(m => m.ID).ToList(); - rectifyRecordIds.AddRange(rectifyRecordIds); + rectifyRecords = GetEntities(e => e.HIDDEN_DANGER_RECTIFY_NOTICE_ID != null && e.HIDDEN_DANGER_RECTIFY_NOTICE_ID == rectifyNotice.ID, filter).ToList(); + rectifyRecordIds = rectifyRecords.Select(m => m.ID).ToList(); sourceIds.AddRange(rectifyRecordIds); } else { - var rectifyRecordIds = GetEntities(e => e.HIDDEN_DANGER_REPORT_ID != null && e.HIDDEN_DANGER_REPORT_ID == dangerReport.ID,new BaseFilter(dangerReport.ORG_ID)).Select(m=>m.ID).ToList(); + rectifyRecords = GetEntities(e => e.HIDDEN_DANGER_REPORT_ID != null && e.HIDDEN_DANGER_REPORT_ID == dangerReport.ID, filter).ToList(); + rectifyRecordIds = rectifyRecords.Select(m => m.ID).ToList(); sourceIds.AddRange(rectifyRecordIds); - rectifyRecordIds.AddRange(rectifyRecordIds); } } } @@ -1725,7 +1727,7 @@ namespace APT.SK.WebApi.Controllers.Api var users = GetEntities(e => e.ENABLE_STATUS == 0, new BaseFilter(check.ORG_ID), null).ToList(); var checkUser = users.FirstOrDefault(t => t.ID == check.APPLY_USER_ID); var departs = GetEntities(e => e.ENABLE_STATUS == 0, new BaseFilter(check.ORG_ID), null).ToList(); - ListformCodes=new List { "SK006","SK014","SK018","SK022"}; + ListformCodes=new List { "SK006","SK014","SK022"}; var approveTemps = GetEntities(e => formCodes.Contains(e.FORM_CODE), new BaseFilter(check.ORG_ID), "Nav_ApproveTempDetails.Nav_ApproveRole").ToList(); #region 安全检查通知 OperateLog noticeLog = new OperateLog(); @@ -1747,16 +1749,17 @@ namespace APT.SK.WebApi.Controllers.Api } else { + //手动发起的检查通知 OperateLogList start = new OperateLogList(); start.USER_NAME = checkUser.NAME; start.NAME = "安全检查通知"; - start.DEAL_DATE = check.MODIFY_TIME; + start.DEAL_DATE = check.STATUS == PFStandardStatus.Draft ? null:check.MODIFY_TIME; start.CREATE_TIME = check.CREATE_TIME; - start.STATUS = 10; + start.STATUS = check.STATUS == PFStandardStatus.Draft? 0 : 10; noticeLog.logList.Add(start); } - //审批 - var approveTemp = approves.FirstOrDefault(t => t.DATA_ID == safeNoticeId); + //审批 + var approveTemp = approves.FirstOrDefault(t => t.DATA_ID == safeNoticeId); if (approveTemp == null) { //判断发起人层级，取审批模板 @@ -1793,14 +1796,14 @@ namespace APT.SK.WebApi.Controllers.Api } 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.CREATE_TIME).ThenBy(m=>m.MODIFY_TIME).ToList(); if (tempApprove != null && tempApprove.Any()) { foreach (var item in tempApprove) { OperateLogList start1 = new OperateLogList(); start1.USER_NAME = item.USER_NAME; - start1.NAME = item.NOTICE_TITLE.Contains("驳回") ? "安全检查通知已被驳回" : item.SOURCE_FORMCODE == "PF119" ? "安全检查通知审批" : item.NOTICE_TITLE.Contains("确认") ? "安全检查通知确认" : "安全检查通知"; + start1.NAME = item.NOTICE_TITLE.Contains("驳回") ? "安全检查通知已被驳回" : "安全检查通知审批"; start1.DEAL_DATE = item.TASK_DT; start1.CREATE_TIME = item.CREATE_TIME; start1.STATUS = item.NOTICE_STATUS == 1 ? 5 : item.NOTICE_STATUS == 2 ? 10 : item.NOTICE_STATUS == 4 ? 15 : 0; @@ -1960,13 +1963,12 @@ namespace APT.SK.WebApi.Controllers.Api } else { - var reportUser = users.FirstOrDefault(t => t.ID == dangerReport.APPLY_USER_ID); OperateLogList start = new OperateLogList(); - start.USER_NAME = reportUser.NAME; + start.USER_NAME = "上报人"; start.NAME = "隐患上报"; - start.DEAL_DATE = dangerReport.MODIFY_TIME; - start.CREATE_TIME = dangerReport.CREATE_TIME; - start.STATUS = 10; + start.DEAL_DATE = null; + start.CREATE_TIME = null; + start.STATUS = 0; hiddenReportLog.logList.Add(start); } //审批 @@ -2007,14 +2009,14 @@ namespace APT.SK.WebApi.Controllers.Api } 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.CREATE_TIME).ThenBy(m => m.MODIFY_TIME).ToList(); if (tempApprove != null && tempApprove.Any()) { foreach (var item in tempApprove) { OperateLogList start1 = new OperateLogList(); start1.USER_NAME = item.USER_NAME; - start1.NAME = item.NOTICE_TITLE.Contains("驳回") ? "隐患上报已被驳回" : item.SOURCE_FORMCODE == "PF119" ? "隐患上报审批" : item.NOTICE_TITLE.Contains("确认") ? "隐患上报确认" : "隐患上报"; + start1.NAME = item.NOTICE_TITLE.Contains("驳回") ? "隐患上报已被驳回" : "隐患上报审批"; start1.DEAL_DATE = item.TASK_DT; start1.CREATE_TIME = item.CREATE_TIME; start1.STATUS = item.NOTICE_STATUS == 1 ? 5 : item.NOTICE_STATUS == 2 ? 10 : item.NOTICE_STATUS == 4 ? 15 : 0; @@ -2022,7 +2024,7 @@ namespace APT.SK.WebApi.Controllers.Api } } } - var temp2 = tasks.Where(t => t.SOURCE_DATA_ID == dangerReportId && t.NOTICE_TITLE.Contains("确认")); + 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(); if (temp2 != null && temp2.Any()) { noticeLog.logList = new List(); @@ -2051,43 +2053,19 @@ namespace APT.SK.WebApi.Controllers.Api else { OperateLogList start = new OperateLogList(); - start.USER_NAME = checkUser != null ? checkUser.NAME : "上报人"; + start.USER_NAME = "上报人"; start.NAME = "隐患上报"; start.DEAL_DATE = null; start.CREATE_TIME = null; start.STATUS = 0; hiddenReportLog.logList.Add(start); - //判断发起人层级，取审批模板 - var departFirst = departs.FirstOrDefault(t => t.ID == check.APPLY_DEPARTMENT_ID); - var param = Enum.GetName(typeof(SKDepartmentTypeEnum), departFirst.DEPARTMENT_TYPE); - if (departFirst.DEPARTMENT_STATUS != 1) - { - param = "公司级"; - } - var approveTempFirst = approveTemps.FirstOrDefault(t => t.PARAM == param && t.FORM_CODE == "SK014"); - if (approveTempFirst != null && approveTempFirst.Nav_ApproveTempDetails != null && approveTempFirst.Nav_ApproveTempDetails.Any()) - { - foreach (var item in approveTempFirst.Nav_ApproveTempDetails.OrderBy(t => t.NUM)) - { - OperateLogList start2 = new OperateLogList(); - start2.USER_NAME = item.Nav_ApproveRole.NAME; - start2.NAME = "隐患上报审批"; - start2.DEAL_DATE = null; - start2.CREATE_TIME = null; - start2.STATUS = 0; - hiddenReportLog.logList.Add(start2); - } - } - else - { - OperateLogList start2 = new OperateLogList(); - start2.USER_NAME = "审批人"; - start2.NAME = "隐患上报审批"; - start2.DEAL_DATE = null; - start2.CREATE_TIME = null; - start2.STATUS = 0; - hiddenReportLog.logList.Add(start2); - } + OperateLogList start2 = new OperateLogList(); + start2.USER_NAME = "审批人"; + start2.NAME = "隐患上报审批"; + start2.DEAL_DATE = null; + start2.CREATE_TIME = null; + start2.STATUS = 0; + hiddenReportLog.logList.Add(start2); OperateLogList start1 = new OperateLogList(); start1.USER_NAME = "整改责任人"; start1.NAME = "隐患上报确认"; @@ -2114,9 +2092,10 @@ 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 : 0; rectifyNoticeLog.logList.Add(start); - var temp2 = tasks.Where(t => t.SOURCE_DATA_ID == rectifyNoticeId && t.NOTICE_TITLE.Contains("确认")); + 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(); if (temp2 != null && temp2.Any()) { + noticeLog.logList = new List(); foreach (var item in temp2) { OperateLogList start1 = new OperateLogList(); @@ -2141,7 +2120,7 @@ namespace APT.SK.WebApi.Controllers.Api } else { OperateLogList start = new OperateLogList(); - start.USER_NAME = "安全员"; + start.USER_NAME = "安全员/上报人"; start.NAME = "隐患整改通知"; start.DEAL_DATE = null; start.CREATE_TIME = null; @@ -2157,7 +2136,158 @@ namespace APT.SK.WebApi.Controllers.Api } result.Add(rectifyNoticeLog); #endregion - + + #region 隐患整改记录 + 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(); + if (items != null && items.Any()) + { + foreach (var temp1 in items) + { + OperateLog refRecordLog = new OperateLog(); + refRecordLog.FORM_NAME = "隐患整改记录"; + refRecordLog.logList = new List(); + OperateLogList start = new OperateLogList(); + start.USER_NAME = temp1.USER_NAME; + start.NAME = "隐患整改记录"; + start.DEAL_DATE = temp1.TASK_DT; + start.CREATE_TIME = temp1.CREATE_TIME; + start.STATUS = temp1.NOTICE_STATUS == 1 ? 5 : temp1.NOTICE_STATUS == 2 ? 10 : temp1.NOTICE_STATUS == 4 ? 15 : 0; + refRecordLog.logList.Add(start); + //验收 + var temp2 = tasks.FirstOrDefault(t => t.SOURCE_DATA_ID!=null && t.SOURCE_DATA_ID == temp1.SOURCE_DATA_ID && t.NOTICE_TITLE.Contains("验收")); + if (temp2 != null) + { + OperateLogList start1 = new OperateLogList(); + start1.USER_NAME = temp2.USER_NAME; + start1.NAME = "隐患整改记录验收"; + start1.DEAL_DATE = temp2.TASK_DT; + start1.CREATE_TIME = temp2.CREATE_TIME; + start1.STATUS = temp2.NOTICE_STATUS == 1 ? 5 : temp2.NOTICE_STATUS == 2 ? 10 : temp2.NOTICE_STATUS == 4 ? 15 : 0; + refRecordLog.logList.Add(start1); + } + else + { + OperateLogList start1 = new OperateLogList(); + start1.USER_NAME = "验收人"; + start1.NAME = "隐患整改记录验收"; + start1.DEAL_DATE = null; + start1.CREATE_TIME = null; + start1.STATUS = 0; + refRecordLog.logList.Add(start1); + } + //审批 + var approveTemp = approves.FirstOrDefault(t => t.DATA_ID == temp1.SOURCE_DATA_ID); + if (approveTemp == null) + { + //判断重大还是一般，取审批模板 + var recordFirst = rectifyRecords.FirstOrDefault(t => t.ID == temp1.SOURCE_DATA_ID); + var param = recordFirst.HIDDEN_LEVEL.GetDescription(); + var approveTempFirst = approveTemps.FirstOrDefault(t => t.PARAM == param && t.FORM_CODE == "SK022"); + if (approveTempFirst != null && approveTempFirst.Nav_ApproveTempDetails != null && approveTempFirst.Nav_ApproveTempDetails.Any()) + { + foreach (var item in approveTempFirst.Nav_ApproveTempDetails.OrderBy(t => t.NUM)) + { + OperateLogList start1 = new OperateLogList(); + start1.USER_NAME = item.Nav_ApproveRole.NAME; + start1.NAME = "隐患整改记录审批"; + start1.DEAL_DATE = null; + start1.CREATE_TIME = null; + start1.STATUS = 0; + refRecordLog.logList.Add(start1); + } + } + else + { + OperateLogList start1 = new OperateLogList(); + start1.USER_NAME = "审批人"; + start1.NAME = "隐患整改记录审批"; + start1.DEAL_DATE = null; + start1.CREATE_TIME = null; + start1.STATUS = 0; + refRecordLog.logList.Add(start1); + } + } + else + { + var tempApprove = tasks.Where(t => t.SOURCE_DATA_ID == approveTemp.ID).OrderBy(t => t.CREATE_TIME).ThenBy(m => m.MODIFY_TIME).ToList(); + if (tempApprove != null && tempApprove.Any()) + { + foreach (var item in tempApprove) + { + OperateLogList start1 = new OperateLogList(); + start1.USER_NAME = item.USER_NAME; + start1.NAME = item.NOTICE_TITLE.Contains("驳回") ? "隐患整改记录已被驳回" : "隐患整改记录审批"; + start1.DEAL_DATE = item.TASK_DT; + start1.CREATE_TIME = item.CREATE_TIME; + start1.STATUS = item.NOTICE_STATUS == 1 ? 5 : item.NOTICE_STATUS == 2 ? 10 : item.NOTICE_STATUS == 4 ? 15 : 0; + refRecordLog.logList.Add(start1); + } + } + } + result.Add(refRecordLog); + } + } + else + { + OperateLog refRecordLog = new OperateLog(); + refRecordLog.FORM_NAME = "隐患整改记录"; + refRecordLog.logList = new List(); + OperateLogList start = new OperateLogList(); + 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.USER_NAME = "验收人"; + start1.NAME = "隐患整改记录验收"; + start1.DEAL_DATE = null; + start1.CREATE_TIME = null; + start1.STATUS = 0; + refRecordLog.logList.Add(start1); + OperateLogList start2 = new OperateLogList(); + start2.USER_NAME = "审批人"; + start2.NAME = "隐患整改记录审批"; + start2.DEAL_DATE = null; + start2.CREATE_TIME = null; + start2.STATUS = 0; + refRecordLog.logList.Add(start2); + result.Add(refRecordLog); + } + } + else + { + OperateLog refRecordLog = new OperateLog(); + refRecordLog.FORM_NAME = "隐患整改记录"; + refRecordLog.logList = new List(); + OperateLogList start = new OperateLogList(); + 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.USER_NAME = "验收人"; + start1.NAME = "隐患整改记录验收"; + start1.DEAL_DATE = null; + start1.CREATE_TIME = null; + start1.STATUS = 0; + refRecordLog.logList.Add(start1); + OperateLogList start2 = new OperateLogList(); + start2.USER_NAME = "审批人"; + start2.NAME = "隐患整改记录审批"; + start2.DEAL_DATE = null; + start2.CREATE_TIME = null; + start2.STATUS = 0; + refRecordLog.logList.Add(start2); + result.Add(refRecordLog); + } + #endregion } return result; } From 515ee2974096b57cbe7b4eb0124b53a64d5c4a85 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: Wed, 19 Nov 2025 16:05:11 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../APT.SK.WebApi/Controllers/Api/CheckSetController.cs | 6 +++--- .../Controllers/Api/EnterpriseLibraryController.cs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/CheckSetController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/CheckSetController.cs index f2f218d..188f3a5 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/CheckSetController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/CheckSetController.cs @@ -440,11 +440,11 @@ namespace APT.SK.WebApi.Controllers.Api { return SafeExecute(() => { - if (entity.PRODUCTION_UNIT_ID == null && entity.CHECK_TYPE_ID == null || entity.CHECK_TYPE == null || entity.DEPARTMENT_ID == null || entity.POST_ID == null) + if (entity.PRODUCTION_UNIT_ID == null && entity.CHECK_TYPE_ID == null || entity.CHECK_TYPE == null || entity.DEPARTMENT_ID == null || entity.Nav_CheckUsers == null||!entity.Nav_CheckUsers.Any()) { - throw new Exception("生产单元,检查层级,检查类型,检查周期,检查部门,检查对象都不能为空"); + throw new Exception("生产单元,检查层级,检查类型,检查周期,检查部门,检查人都不能为空"); } - var record = this.GetEntity(t => t.ID != entity.ID && t.PRODUCTION_UNIT_ID == entity.PRODUCTION_UNIT_ID && t.CHECK_TYPE == entity.CHECK_TYPE && t.CHECK_TYPE_ID == entity.CHECK_TYPE_ID && t.CHECK_CYCLE == entity.CHECK_CYCLE && t.DEPARTMENT_ID == entity.DEPARTMENT_ID && t.POST_ID == entity.POST_ID); + var record = this.GetEntity(t => t.ID != entity.ID && t.PRODUCTION_UNIT_ID == entity.PRODUCTION_UNIT_ID && t.CHECK_TYPE == entity.CHECK_TYPE && t.CHECK_TYPE_ID == entity.CHECK_TYPE_ID && t.CHECK_CYCLE == entity.CHECK_CYCLE && t.DEPARTMENT_ID == entity.DEPARTMENT_ID); if (record != null) { throw new Exception("相同检查已存在，请修改检查信息或回到列表页检索"); diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/EnterpriseLibraryController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/EnterpriseLibraryController.cs index 12bc562..4acc389 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/EnterpriseLibraryController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/EnterpriseLibraryController.cs @@ -2151,7 +2151,7 @@ namespace APT.SK.WebApi.Controllers.Api var detailIds = details.Select(t => t.ID).ToList(); var contents = this.GetEntities(t => detailIds.Contains(t.ENTERPRISE_LIBRARY_DETAIL_ID), new BaseFilter(filter.OrgId), "Nav_Contents"); var contentIds = contents.Select(t => t.ID).ToList(); - var contentdeparts = this.GetEntities(t => contentIds.Contains(t.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID), new BaseFilter(filter.OrgId), "Nav_Department", "Nav_CheckType", "Nav_DetailPosts.Nav_Post"); + var contentdeparts = this.GetEntities(t => contentIds.Contains(t.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID), new BaseFilter(filter.OrgId), "Nav_Department", "Nav_CheckType", "Nav_DetailPosts.Nav_Post", "Nav_DetailUsers.Nav_User"); var contenthiddens = this.GetEntities(t => contentIds.Contains(t.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID), new BaseFilter(filter.OrgId), "Nav_Question"); var contentbasics = this.GetEntities(t => contentIds.Contains(t.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID), new BaseFilter(filter.OrgId), "Nav_Law"); foreach (var detail in details) From 2b13187238d6b6474f135eae9b4ac77163d04467 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: Wed, 19 Nov 2025 17:20:24 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=8F=AF=E8=A7=86=E5=8C=96=E8=8A=82?= =?UTF-8?q?=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Api/SecurityInspectionNoticeController.cs | 38 ++++++++----------- 1 file changed, 15 insertions(+), 23 deletions(-) diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionNoticeController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionNoticeController.cs index 751176a..a294faf 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionNoticeController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionNoticeController.cs @@ -1667,7 +1667,6 @@ namespace APT.SK.WebApi.Controllers.Api Guid? dangerReportId = null; Guid? rectifyNoticeId = null; List rectifyRecordIds = new List(); - List hidRectifyRecordIds = new List(); Guid Keyword = new Guid(filter.Keyword); var check = GetEntity(Keyword); if (check == null) @@ -1681,7 +1680,7 @@ namespace APT.SK.WebApi.Controllers.Api safeNoticeId = check.ID; sourceIds.Add(check.ID); T_SK_HIDDEN_DANGER_REPORT dangerReport = null; - List rectifyRecords = new List(); ; + List rectifyRecords = new List(); safeRecordIds = GetEntities(e => e.SECURITY_INSPECTION_NOTICE_ID != null && e.SECURITY_INSPECTION_NOTICE_ID == check.ID, filter).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); @@ -1718,11 +1717,6 @@ namespace APT.SK.WebApi.Controllers.Api approves = GetEntities(e => sourceIds.Contains(e.DATA_ID), null, null).ToList(); approveIds = approves.Select(m => m.ID).ToList(); } - var approveDetails = new List(); - if (approveIds != null && approveIds.Any()) - { - approveDetails = GetEntities(e => approveIds.Contains(e.APPROVE_ID), new BaseFilter(check.ORG_ID), null).ToList(); - } var tasks = GetEntities(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(e => e.ENABLE_STATUS == 0, new BaseFilter(check.ORG_ID), null).ToList(); 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(); start.USER_NAME = temp1.USER_NAME; - start.NAME = "安全检查通知"; + start.NAME =temp1.NOTICE_STATUS==4? "安全检查通知(系统归档)" : "安全检查通知"; start.DEAL_DATE = temp1.TASK_DT; start.CREATE_TIME = temp1.CREATE_TIME; 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(); 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.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); } //审批 @@ -1796,7 +1790,7 @@ namespace APT.SK.WebApi.Controllers.Api } 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()) { 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()) { foreach (var item in temp2) @@ -1845,14 +1839,14 @@ namespace APT.SK.WebApi.Controllers.Api 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()) { foreach (var temp1 in itemps) { OperateLogList start = new OperateLogList(); start.USER_NAME = temp1.USER_NAME; - start.NAME = "安全检查记录"; + start.NAME = temp1.NOTICE_STATUS== 4? "安全检查记录(系统归档)" : "安全检查记录"; start.DEAL_DATE = temp1.TASK_DT; start.CREATE_TIME = temp1.CREATE_TIME; 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; 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()) { foreach (var item in temp2) @@ -1993,7 +1987,7 @@ namespace APT.SK.WebApi.Controllers.Api start1.DEAL_DATE = null; start1.CREATE_TIME = null; start1.STATUS = 0; - noticeLog.logList.Add(start1); + hiddenReportLog.logList.Add(start1); } } else @@ -2009,7 +2003,7 @@ namespace APT.SK.WebApi.Controllers.Api } 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()) { 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()) { - noticeLog.logList = new List(); foreach (var item in temp2) { OperateLogList start1 = new OperateLogList(); @@ -2092,10 +2085,9 @@ 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 : 0; 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()) { - noticeLog.logList = new List(); foreach (var item in temp2) { OperateLogList start1 = new OperateLogList(); @@ -2141,7 +2133,7 @@ namespace APT.SK.WebApi.Controllers.Api 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()) { foreach (var temp1 in items) @@ -2212,7 +2204,7 @@ namespace APT.SK.WebApi.Controllers.Api } 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()) { foreach (var item in tempApprove)