From a5f00ca2866449c8dcaa7844bdd3e7d01e5fba19 Mon Sep 17 00:00:00 2001 From: wjn Date: Wed, 26 Jun 2024 10:31:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/PF/PFApproveCallBackService.cs | 19 +++++++++++++++++-- .../Controllers/Api/HazardTaskController.cs | 2 +- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs index 01e09a6..570bcf0 100644 --- a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs +++ b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs @@ -5404,6 +5404,7 @@ namespace APT.BaseData.Services.DomainServices List hazards = new List(); List listHazardDetails = new List(); List listHazardIdentifyings = new List(); + List listDetailHazardIdentifyings = new List(); List listHazardArea = new List(); List taskUsers = new List(); List sendNoticeList = null; @@ -5539,7 +5540,7 @@ namespace APT.BaseData.Services.DomainServices hazardTask.ORG_ID = entity.ORG_ID; hazardTask.LIABLE_USER_ID = hazardDetail.CHARGE_USER_ID; hazardTask.PLAN_ID = entity.ID; - hazardDetail.Nav_Areas.ForEach(t => + foreach(var t in hazardDetail.Nav_Areas) { T_HM_HAZARD_TASK_AREA area = new T_HM_HAZARD_TASK_AREA(); area.ORG_ID = entity.ORG_ID; @@ -5547,13 +5548,25 @@ namespace APT.BaseData.Services.DomainServices area.TASK_ID = hazardTask.ID; listHazardArea.Add(area); T_HM_HAZARD_TASK_DETAIL taskDetail = new T_HM_HAZARD_TASK_DETAIL(); + taskDetail.ID = Guid.NewGuid(); taskDetail.ORG_ID = entity.ORG_ID; taskDetail.AREA_ID = t.AREA_ID; taskDetail.TASK_ID = hazardTask.ID; taskDetail.RECORD_USER_ID = null; taskDetail.DEAL_STATUS = (int)FOUserShiftStatusEnum.待处理; listHazardDetails.Add(taskDetail); - }); + BaseFilter hazardfilter = new BaseFilter(orgId); + hazardfilter.SelectField = new string[] { "IDENTIFYING_ID" }; + var hazarddb = GetEntities(t => t.AREA_ID == t.AREA_ID && t.STATUS == 0, hazardfilter); + foreach(var hazard in hazarddb) + { + T_HM_HAZARD_TASK_DETAIL_IDENTIFYING taskDetailIdentify = new T_HM_HAZARD_TASK_DETAIL_IDENTIFYING(); + taskDetailIdentify.ORG_ID = entity.ORG_ID; + taskDetailIdentify.IDENTIFYING_ID = hazard.IDENTIFYING_ID; + taskDetailIdentify.TASK_DETAIL_ID = taskDetail.ID; + listDetailHazardIdentifyings.Add(taskDetailIdentify); + } + }; if (hazardDetail.Nav_Identifyings != null && hazardDetail.Nav_Identifyings.Any()) { @@ -5598,6 +5611,8 @@ namespace APT.BaseData.Services.DomainServices BantchAddEntityNoCommit(listHazardIdentifyings); if (listHazardDetails.Any()) BantchAddEntityNoCommit(listHazardDetails); + if (listDetailHazardIdentifyings.Any()) + BantchAddEntityNoCommit(listDetailHazardIdentifyings); if (taskUsers.Any()) BantchAddEntityNoCommit(taskUsers); if (sendNoticeList != null && sendNoticeList.Any()) diff --git a/APT.MicroApi/APT.HM.WebApi/Controllers/Api/HazardTaskController.cs b/APT.MicroApi/APT.HM.WebApi/Controllers/Api/HazardTaskController.cs index 40f53c1..52bc061 100644 --- a/APT.MicroApi/APT.HM.WebApi/Controllers/Api/HazardTaskController.cs +++ b/APT.MicroApi/APT.HM.WebApi/Controllers/Api/HazardTaskController.cs @@ -258,7 +258,7 @@ namespace APT.HM.WebApi.Controllers.Api var dangerDB = this.GetEntities(t => areaList.Contains((Guid)t.AREA_ID) && t.STATUS == (int)HMOperationStepEnum.有效, baseFilter); foreach (var detail in currDetail) { - var dangerDBAreas = dangerDB.Where(t => t.AREA_ID == detail.AREA_ID && detail.Nav_Identifyings.Select(x => x.ID).Contains(t.IDENTIFYING_ID)); + var dangerDBAreas = dangerDB.Where(t => t.AREA_ID == detail.AREA_ID && detail.Nav_Identifyings.Select(x => x.IDENTIFYING_ID).Contains(t.IDENTIFYING_ID)); if (dangerDBAreas.Any()) { foreach (var danger in dangerDBAreas)