From f4082f8d7f5e4deb19d2b9717f71d97748254d5f 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, 9 Oct 2025 17:17:24 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A6=E5=8F=91=E6=A3=80=E6=9F=A5=E8=AE=B0?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Api/SKController.cs | 25 ++++++++++--------- .../Api/SecurityInspectionRecordController.cs | 2 +- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs index 287dc3e..8465206 100644 --- a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs +++ b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs @@ -588,7 +588,7 @@ namespace APT.PP.WebApi.Controllers.Api filter.IgnoreDataRule = true; var baseFilter = new BaseFilter(filter.GetOrgId()); baseFilter.IgnoreDataRule = true; - baseFilter.SelectField = new string[] { "ID", "MineType", "CHECK_TYPE_ID","APPLY_DEPARTMENT_ID","APPLY_USER_ID","PLANCHECKFREQUENCY","DEPARTMENT_TYPE","CHECK_TIME","CHECK_PERSON", + baseFilter.SelectField = new string[] { "ID", "PRODUCTION_UNIT_ID", "CHECK_TYPE_ID","APPLY_DEPARTMENT_ID","APPLY_USER_ID","PLANCHECKFREQUENCY","DEPARTMENT_TYPE","CHECK_TIME","CHECK_PERSON", "Nav_CheckNoticeDetails.RISK_AREA_ID","Nav_CheckNoticeDetails.CHECK_CONTENTS_ID","Nav_CheckNoticeDetails.CHECKCONTENT","Nav_CheckNoticeDetails.CHECKPROOF","Nav_CheckNoticeDetails.CHECKSTANDARD", "Nav_CheckNoticeFiles.IMG_FILE_ID", "Nav_CheckNoticeDetails.Nav_CheckNoticeDetailUsers.USER_ID", "Nav_CheckNoticeDetails.Nav_CheckNoticeDetailBasics.LAW_ID" }; //指定字段，包括导航属性 Expression> expression = i => i.IS_DELETED == false && i.CHECK_TIME != null && i.CHECK_TIME.Value.Date == DateTime.Now.Date && i.CHECK_TIME.Value.Hour == dtNow.Hour; @@ -624,7 +624,7 @@ namespace APT.PP.WebApi.Controllers.Api T_SK_SECURITY_INSPECTION_RECORD record = new T_SK_SECURITY_INSPECTION_RECORD(); record.SECURITY_INSPECTION_NOTICE_ID = item.ID; record.ORG_ID = filter.GetOrgId(); - record.MineType = item.MineType; + //record.MineType = item.MineType; record.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID; record.APPLY_DEPARTMENT_ID = item.APPLY_DEPARTMENT_ID; record.APPLY_USER_ID = item.APPLY_USER_ID; @@ -4927,6 +4927,7 @@ namespace APT.PP.WebApi.Controllers.Api List detailContents = new List(); if (setList != null && setList.Any()) { + var proMinetypes = this.GetEntities(t => t.IS_DELETED == false, new BaseFilter(filter.OrgId)); var checkTypes = this.GetEntities(t => t.IS_DELETED == false, new BaseFilter(filter.OrgId)); var checkTypeIds = checkTypes.Where(t => t.NAME == "岗位排查").Select(m => m.ID).ToList(); var departs = this.GetEntities(t => t.ENABLE_STATUS == 0, new BaseFilter(filter.OrgId), "Nav_User"); @@ -4963,7 +4964,7 @@ namespace APT.PP.WebApi.Controllers.Api { T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART de = new T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART(); de.POST_NAME = post?.NAME; - de.MineType = item.MineType; + de.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID; de.AREA_NAME = item.Nav_Area?.NAME; de.ENTERPRISE_LIBRARY_DETAIL_ID = contentFirst?.ENTERPRISE_LIBRARY_DETAIL_ID; de.ENTERPRISE_LIBRARY_ID = item.ID; @@ -4983,7 +4984,7 @@ namespace APT.PP.WebApi.Controllers.Api { T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART de = new T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART(); de.POST_NAME = "未配置辨识岗位"; - de.MineType = item.MineType; + de.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID; de.AREA_NAME = item.Nav_Area?.NAME; de.ENTERPRISE_LIBRARY_DETAIL_ID = contentFirst?.ENTERPRISE_LIBRARY_DETAIL_ID; de.ENTERPRISE_LIBRARY_ID = item.ID; @@ -5041,14 +5042,14 @@ namespace APT.PP.WebApi.Controllers.Api } } } - var group = detailContents.Where(m => checkCycles.Contains(m.CHECK_CYCLE)).GroupBy(t => new { t.MineType, t.CHECK_TYPE, t.CHECK_CYCLE, t.DEPART_NAME, t.DEPARTMENT_ID, t.CHECK_TYPE_ID, t.TYPE_NAME, t.POST_NAME, t.POST_ID }).ToList(); + var group = detailContents.Where(m => checkCycles.Contains(m.CHECK_CYCLE)).GroupBy(t => new { t.PRODUCTION_UNIT_ID, t.CHECK_TYPE, t.CHECK_CYCLE, t.DEPART_NAME, t.DEPARTMENT_ID, t.CHECK_TYPE_ID, t.TYPE_NAME, t.POST_NAME, t.POST_ID }).ToList(); foreach (var item in group) { CheckListNew listNew = new CheckListNew(); - listNew.Mine = item.Key.MineType; + listNew.PRODUCTION_UNIT_ID = item.Key.PRODUCTION_UNIT_ID; listNew.Cycle = item.Key.CHECK_CYCLE; listNew.DepartType = item.Key.CHECK_TYPE; - listNew.MineType = item.Key.MineType.GetDescription(); + listNew.MineType = proMinetypes.FirstOrDefault(t=>t.ID == item.Key.PRODUCTION_UNIT_ID)?.NAME; listNew.CheckType = item.Key.TYPE_NAME; listNew.CheckCycle = item.Key.CHECK_CYCLE.GetDescription(); listNew.CheckLevel = item.Key.CHECK_TYPE.GetDescription(); @@ -5058,7 +5059,7 @@ namespace APT.PP.WebApi.Controllers.Api listNew.CheckPost = item.Key.POST_NAME; listNew.CheckDepartId = item.Key.DEPARTMENT_ID; listNew.CheckTypeId = item.Key.CHECK_TYPE_ID; - var depathaveIds = detailContents.Where(t => t.DEPARTMENT_ID == item.Key.DEPARTMENT_ID && t.CHECK_TYPE_ID == item.Key.CHECK_TYPE_ID && t.CHECK_TYPE == item.Key.CHECK_TYPE && t.CHECK_CYCLE == item.Key.CHECK_CYCLE && t.MineType == item.Key.MineType && t.POST_NAME == item.Key.POST_NAME && t.POST_ID == item.Key.POST_ID).Select(m => m.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID).Distinct().ToList(); + var depathaveIds = detailContents.Where(t => t.DEPARTMENT_ID == item.Key.DEPARTMENT_ID && t.CHECK_TYPE_ID == item.Key.CHECK_TYPE_ID && t.CHECK_TYPE == item.Key.CHECK_TYPE && t.CHECK_CYCLE == item.Key.CHECK_CYCLE && t.PRODUCTION_UNIT_ID == item.Key.PRODUCTION_UNIT_ID && t.POST_NAME == item.Key.POST_NAME && t.POST_ID == item.Key.POST_ID).Select(m => m.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID).Distinct().ToList(); var temps = contents.Where(t => depathaveIds.Contains(t.ID)).Distinct().ToList(); if (temps.Any()) { @@ -5079,7 +5080,7 @@ namespace APT.PP.WebApi.Controllers.Api } list.Add(listNew); } - list = list.Where(m => m.CheckDepartId != null).OrderBy(y => y.MineType).ThenBy(x => x.Num).ThenBy(n => n.CheckDepart).ToList(); + list = list.Where(m => m.CheckDepartId != null).OrderBy(y => y.PRODUCTION_UNIT_ID).ThenBy(x => x.Num).ThenBy(n => n.CheckDepart).ToList(); } DateTime dt = DateTime.Now; if (filter.Parameter1 != null) @@ -5130,7 +5131,7 @@ namespace APT.PP.WebApi.Controllers.Api record.ORG_ID = filter.OrgId; record.APPLY_DEPARTMENT_ID = userInfo.DEPARTMENT_ID; record.APPLY_USER_ID = userInfo.ID; - record.MineType = item.Mine; + record.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID; record.CHECK_TYPE_ID = item.CheckTypeId; record.PLANCHECKFREQUENCY = item.Cycle; record.DEPARTMENT_TYPE = item.DepartType; @@ -5199,7 +5200,7 @@ namespace APT.PP.WebApi.Controllers.Api { foreach (var item in checkList) { - var setTime = setList.FirstOrDefault(t => t.MineType == item.Mine && t.CHECK_CYCLE == item.Cycle); + var setTime = setList.FirstOrDefault(t => t.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && t.CHECK_CYCLE == item.Cycle); var userInfo = users.FirstOrDefault(t => t.DEPARTMENT_ID == item.CheckDepartId && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME == item.CheckPost); //触发安全检查通知给对应的审批角色 if (item.CheckPost == "安环部安全员") @@ -5225,7 +5226,7 @@ namespace APT.PP.WebApi.Controllers.Api safeNotice.ORG_ID = filter.OrgId; safeNotice.APPLY_DEPARTMENT_ID = userInfo.DEPARTMENT_ID; safeNotice.APPLY_USER_ID = userInfo.ID; - safeNotice.MineType = item.Mine; + safeNotice.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID; safeNotice.CHECK_TYPE_ID = item.CheckTypeId; safeNotice.PLANCHECKFREQUENCY = item.Cycle; safeNotice.DEPARTMENT_TYPE = item.DepartType; diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionRecordController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionRecordController.cs index 8bee090..da8e38d 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionRecordController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionRecordController.cs @@ -653,7 +653,7 @@ namespace APT.SK.WebApi.Controllers.Api summary.SECURITY_INSPECTION_NOTICE_ID = notice != null ? notice.ID : null; summary.APPLY_DEPARTMENT_ID = notice != null ? notice.APPLY_DEPARTMENT_ID : entity.APPLY_DEPARTMENT_ID; summary.APPLY_USER_ID = notice != null ? notice.APPLY_USER_ID : entity.APPLY_USER_ID; - summary.MineType = notice != null ? notice.MineType : entity.MineType; + //summary.MineType = notice != null ? notice.MineType : entity.MineType; summary.PRODUCTION_UNIT_ID = notice != null ? notice.PRODUCTION_UNIT_ID : entity.PRODUCTION_UNIT_ID; summary.CHECK_TYPE_ID = notice != null ? notice.CHECK_TYPE_ID : entity.CHECK_TYPE_ID; summary.PLANCHECKFREQUENCY = notice != null ? notice.PLANCHECKFREQUENCY : entity.PLANCHECKFREQUENCY;