From 366610fa66f0e1c23fbd1876141dbeaf3f93b951 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: Mon, 8 Dec 2025 02:44:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/PF/PFApproveCallBackService.cs | 4 +- .../Api/RiskEvaluationController.cs | 54 +++++++--- .../Api/RiskEvaluationSummaryController.cs | 89 ++++++++++++---- .../Controllers/Api/RiskIdentifyController.cs | 4 +- .../Api/RiskIdentifyResultController.cs | 88 +++++++++++---- .../RiskIdentifyResultSummaryController.cs | 100 +++++++++++++----- 6 files changed, 256 insertions(+), 83 deletions(-) diff --git a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs index 8579a20..782c491 100644 --- a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs +++ b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs @@ -13817,8 +13817,8 @@ namespace APT.BaseData.Services.DomainServices dep.ORG_ID = detail.ORG_ID; dep.RISK_EVALUATION_DETAIL_ID = detail.ID; detailMeasures.Add(dep); - var measureTemp = i + "、" + item; - detail.MEASURE = detail.MEASURE + measureTemp; + //var measureTemp = i + "、" + item; + //detail.MEASURE = detail.MEASURE + measureTemp; i++; } } diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationController.cs index 32404f0..6ea726b 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationController.cs @@ -62,6 +62,7 @@ namespace APT.SK.WebApi.Controllers.Api List deletePostIds = new List(); List deletePostDetIds = new List(); List deleteDetailIds = new List(); + List detailList = new List(); List measureList = new List(); List departList = new List(); List postList = new List(); @@ -107,42 +108,65 @@ namespace APT.SK.WebApi.Controllers.Api if (details != null && details.Any()) { foreach (var item in details) - { - item.ORG_ID = entity.ORG_ID; - item.RISK_EVALUATION_ID = entity.ID; + { + T_SK_RISK_EVALUATION_DETAIL de = new T_SK_RISK_EVALUATION_DETAIL(); + de.ORG_ID = entity.ORG_ID; + de.RISK_EVALUATION_ID = entity.ID; + de.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID; + de.AREA_ID = item.AREA_ID; + de.RISK_NAME = item.RISK_NAME; + de.RISK_DESCRIPTION = item.RISK_DESCRIPTION; + de.TYPE_ID = item.TYPE_ID; + de.ENABLE_STATUS = item.ENABLE_STATUS; + de.MARK = item.MARK; + de.EMERGENCY = item.EMERGENCY; + de.ENTERPRISE_LIBRARY_ID = item.ENTERPRISE_LIBRARY_ID; if (item.Nav_DetailMeasures != null && item.Nav_DetailMeasures.Any()) { - foreach (var item2 in item.Nav_DetailMeasures) + foreach (var mm in item.Nav_DetailMeasures) { + T_SK_RISK_EVALUATION_DETAIL_MEASURE item2 = new T_SK_RISK_EVALUATION_DETAIL_MEASURE(); item2.ORG_ID = entity.ORG_ID; - item2.RISK_EVALUATION_DETAIL_ID = item.ID; - measureList.Add(item2); + item2.RISK_EVALUATION_DETAIL_ID = de.ID; + item2.NUM = mm.NUM; + item2.MEASURES_NAME = mm.MEASURES_NAME; + measureList.Add(item2); + var temp = (item2.NUM == null || item2.NUM == 0) ? "1" : item2.NUM + "、" + item2.MEASURES_NAME + Environment.NewLine; + de.MEASURE = de.MEASURE + temp; } } + detailList.Add(de); item.Nav_DetailMeasures = null; if (item.Nav_DetailDeparts != null && item.Nav_DetailDeparts.Any()) { - foreach (var item2 in item.Nav_DetailDeparts) + foreach (var mm in item.Nav_DetailDeparts) { + T_SK_RISK_EVALUATION_DETAIL_DEPART item2 = new T_SK_RISK_EVALUATION_DETAIL_DEPART(); item2.ORG_ID = entity.ORG_ID; - item2.RISK_EVALUATION_DETAIL_ID = item.ID; + item2.RISK_EVALUATION_DETAIL_ID = de.ID; + item2.DEPARTMENT_TYPE = mm.DEPARTMENT_TYPE; + item2.DEPARTMENT_ID = mm.DEPARTMENT_ID; departList.Add(item2); } } item.Nav_DetailDeparts = null; if (item.Nav_DetailPosts != null && item.Nav_DetailPosts.Any()) { - foreach (var item2 in item.Nav_DetailPosts) + foreach (var mm in item.Nav_DetailPosts) { + T_SK_RISK_EVALUATION_DETAIL_POST item2 = new T_SK_RISK_EVALUATION_DETAIL_POST(); item2.ORG_ID = entity.ORG_ID; - item2.RISK_EVALUATION_DETAIL_ID = item.ID; + item2.RISK_EVALUATION_DETAIL_ID = de.ID; + item2.DEPARTMENT_ID = mm.DEPARTMENT_ID; postList.Add(item2); if (item2.Nav_PostDetails != null && item2.Nav_PostDetails.Any()) { - foreach (var item3 in item2.Nav_PostDetails) + foreach (var nn in item2.Nav_PostDetails) { + T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL item3 = new T_SK_RISK_EVALUATION_DETAIL_POST_DETAIL(); item3.ORG_ID = entity.ORG_ID; item3.RISK_EVALUATION_DETAIL_POST_ID = item2.ID; + item3.POST_ID = nn.POST_ID; postDetList.Add(item3); } } @@ -232,8 +256,8 @@ namespace APT.SK.WebApi.Controllers.Api this.BantchDeleteEntityNoCommit(deleteDetailIds); if (entity != null) UpdateEntityNoCommit(entity); - if (details != null && details.Any()) - BantchSaveEntityNoCommit(details); + if (detailList != null && detailList.Any()) + BantchSaveEntityNoCommit(detailList); if (files != null && files.Any()) BantchSaveEntityNoCommit(files); if (requires != null && requires.Any()) @@ -263,8 +287,8 @@ namespace APT.SK.WebApi.Controllers.Api this.BantchDeleteEntityNoCommit(deleteDetailIds); if (entity != null) UpdateEntityNoCommit(entity); - if (details != null && details.Any()) - BantchSaveEntityNoCommit(details); + if (detailList != null && detailList.Any()) + BantchSaveEntityNoCommit(detailList); if (files != null && files.Any()) BantchSaveEntityNoCommit(files); if (requires != null && requires.Any()) diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationSummaryController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationSummaryController.cs index ddedc52..e473067 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationSummaryController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationSummaryController.cs @@ -52,50 +52,83 @@ namespace APT.SK.WebApi.Controllers.Api var files = entity.Nav_Files; entity.Nav_Files = null; entity.ApplyDepartmentName = this.GetEntity(t => t.ID == departId).NAME; - entity.ApplyPostName = this.GetEntity(t => t.ID == userId, "Nav_Person.Nav_Post")?.Nav_Person?.Nav_Post?.NAME; + entity.ApplyPostName = this.GetEntity(t => t.ID == userId, "Nav_Person.Nav_Post")?.Nav_Person?.Nav_Post?.NAME; + List detailIds = new List(); + List deleteMeasureIds = new List(); + List deleteDepartIds = new List(); + List deletePostIds = new List(); + List deletePostDetailIds = new List(); + List detailList = new List(); List measureList = new List(); List departList = new List(); List postList = new List(); List postDetList = new List(); if (details != null && details.Any()) - { + { + detailIds = this.GetEntities(t => t.RISK_EVALUATION_SUMMARY_ID == entity.ID, new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList(); + deleteMeasureIds = this.GetEntities(t => detailIds.Contains(t.RISK_EVALUATION_SUMMARY_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList(); + deleteDepartIds = this.GetEntities(t => detailIds.Contains(t.RISK_EVALUATION_SUMMARY_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList(); + deletePostIds = this.GetEntities(t => detailIds.Contains(t.RISK_EVALUATION_SUMMARY_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList(); + deletePostDetailIds = this.GetEntities(t => deletePostIds.Contains(t.RISK_EVALUATION_SUMMARY_DETAIL_POST_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList(); foreach (var item in details) { - item.ORG_ID = entity.ORG_ID; - item.RISK_EVALUATION_SUMMARY_ID = entity.ID; + T_SK_RISK_EVALUATION_SUMMARY_DETAIL de = new T_SK_RISK_EVALUATION_SUMMARY_DETAIL(); + de.ORG_ID = entity.ORG_ID; + de.RISK_EVALUATION_SUMMARY_ID = entity.ID; + de.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID; + de.AREA_ID = item.AREA_ID; + de.RISK_NAME = item.RISK_NAME; + de.RISK_DESCRIPTION = item.RISK_DESCRIPTION; + de.TYPE_ID = item.TYPE_ID; + de.ENABLE_STATUS = item.ENABLE_STATUS; + de.MARK = item.MARK; + de.EMERGENCY = item.EMERGENCY; if (item.Nav_DetailMeasures != null && item.Nav_DetailMeasures.Any()) { - foreach (var item2 in item.Nav_DetailMeasures) + foreach (var mm in item.Nav_DetailMeasures) { + T_SK_RISK_EVALUATION_SUMMARY_DETAIL_MEASURE item2 = new T_SK_RISK_EVALUATION_SUMMARY_DETAIL_MEASURE(); item2.ORG_ID = entity.ORG_ID; - item2.RISK_EVALUATION_SUMMARY_DETAIL_ID = item.ID; - measureList.Add(item2); + item2.RISK_EVALUATION_SUMMARY_DETAIL_ID = de.ID; + item2.NUM = mm.NUM; + item2.MEASURES_NAME = mm.MEASURES_NAME; + measureList.Add(item2); + var temp = (item2.NUM == null || item2.NUM == 0) ? "1" : item2.NUM + "、" + item2.MEASURES_NAME + Environment.NewLine; + de.MEASURE = de.MEASURE + temp; } } + detailList.Add(de); item.Nav_DetailMeasures = null; if (item.Nav_DetailDeparts != null && item.Nav_DetailDeparts.Any()) { - foreach (var item2 in item.Nav_DetailDeparts) + foreach (var mm in item.Nav_DetailDeparts) { + T_SK_RISK_EVALUATION_SUMMARY_DETAIL_DEPART item2 = new T_SK_RISK_EVALUATION_SUMMARY_DETAIL_DEPART(); item2.ORG_ID = entity.ORG_ID; - item2.RISK_EVALUATION_SUMMARY_DETAIL_ID = item.ID; + item2.RISK_EVALUATION_SUMMARY_DETAIL_ID = de.ID; + item2.DEPARTMENT_TYPE = mm.DEPARTMENT_TYPE; + item2.DEPARTMENT_ID = mm.DEPARTMENT_ID; departList.Add(item2); } } item.Nav_DetailDeparts = null; if (item.Nav_DetailPosts != null && item.Nav_DetailPosts.Any()) { - foreach (var item2 in item.Nav_DetailPosts) + foreach (var mm in item.Nav_DetailPosts) { + T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST item2 = new T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST(); item2.ORG_ID = entity.ORG_ID; - item2.RISK_EVALUATION_SUMMARY_DETAIL_ID = item.ID; + item2.RISK_EVALUATION_SUMMARY_DETAIL_ID = de.ID; + item2.DEPARTMENT_ID = mm.DEPARTMENT_ID; postList.Add(item2); if (item2.Nav_PostDetails != null && item2.Nav_PostDetails.Any()) { - foreach (var item3 in item2.Nav_PostDetails) + foreach (var nn in item2.Nav_PostDetails) { + T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL item3 = new T_SK_RISK_EVALUATION_SUMMARY_DETAIL_POST_DETAIL(); item3.ORG_ID = entity.ORG_ID; item3.RISK_EVALUATION_SUMMARY_DETAIL_POST_ID = item2.ID; + item3.POST_ID = nn.POST_ID; postDetList.Add(item3); } } @@ -134,11 +167,21 @@ namespace APT.SK.WebApi.Controllers.Api var codes = CodeRuleService.NewGenSerial(sysFilter); var serialCode = codes.Split(new char[] { ',' }); MFlowPermitService.InsertApprove(serialCode[0], "SK041", "", entity.ID, "SK041_SHOWPRINT", entity.TaskID, true, () => - { + { + if (deleteMeasureIds != null && deleteMeasureIds.Any()) + this.BantchDeleteEntityNoCommit(deleteMeasureIds); + if (deleteDepartIds != null && deleteDepartIds.Any()) + this.BantchDeleteEntityNoCommit(deleteDepartIds); + if (deletePostDetailIds != null && deletePostDetailIds.Any()) + this.BantchDeleteEntityNoCommit(deletePostDetailIds); + if (deletePostIds != null && deletePostIds.Any()) + this.BantchDeleteEntityNoCommit(deletePostIds); + if (detailIds != null && detailIds.Any()) + this.BantchDeleteEntityNoCommit(detailIds); if (entity != null) UpdateEntityNoCommit(entity); - if (details != null && details.Any()) - BantchSaveEntityNoCommit(details); + if (detailList != null && detailList.Any()) + BantchSaveEntityNoCommit(detailList); if (files != null && files.Any()) BantchSaveEntityNoCommit(files); if (requires != null && requires.Any()) @@ -155,11 +198,21 @@ namespace APT.SK.WebApi.Controllers.Api return true; } this.UnifiedCommit(() => - { + { + if (deleteMeasureIds != null && deleteMeasureIds.Any()) + this.BantchDeleteEntityNoCommit(deleteMeasureIds); + if (deleteDepartIds != null && deleteDepartIds.Any()) + this.BantchDeleteEntityNoCommit(deleteDepartIds); + if (deletePostDetailIds != null && deletePostDetailIds.Any()) + this.BantchDeleteEntityNoCommit(deletePostDetailIds); + if (deletePostIds != null && deletePostIds.Any()) + this.BantchDeleteEntityNoCommit(deletePostIds); + if (detailIds != null && detailIds.Any()) + this.BantchDeleteEntityNoCommit(detailIds); if (entity != null) UpdateEntityNoCommit(entity); - if (details != null && details.Any()) - BantchSaveEntityNoCommit(details); + if (detailList != null && detailList.Any()) + BantchSaveEntityNoCommit(detailList); if (files != null && files.Any()) BantchSaveEntityNoCommit(files); if (requires != null && requires.Any()) diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyController.cs index 300cf37..800d66e 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyController.cs @@ -165,8 +165,8 @@ namespace APT.SK.WebApi.Controllers.Api this.BantchDeleteEntityNoCommit(deleteDetailIds); if (entity != null) UpdateEntityNoCommit(entity); - if (details != null && details.Any()) - BantchSaveEntityNoCommit(details); + if (detailList != null && detailList.Any()) + BantchSaveEntityNoCommit(detailList); if (files != null && files.Any()) BantchSaveEntityNoCommit(files); if (requires != null && requires.Any()) diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyResultController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyResultController.cs index b54448d..13f21fd 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyResultController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyResultController.cs @@ -59,11 +59,14 @@ namespace APT.SK.WebApi.Controllers.Api entity.ApplyPostName = this.GetEntity(t => t.ID == userId, "Nav_Person.Nav_Post")?.Nav_Person?.Nav_Post?.NAME; List deleteMeasureIds = new List(); List deleteDepartIds = new List(); - List deletePostIds = new List(); - List deleteDetailIds = new List(); + List deletePostIds = new List(); + List deletePostDetailIds = new List(); + List deleteDetailIds = new List(); + List detailList = new List(); List measureList = new List(); List departList = new List(); - List postList = new List(); + List postList = new List(); + List postDetailList = new List(); //更新标识字段 var record = this.GetEntity(t => t.ID == entity.ID, "Nav_Details"); if (record != null && record.Nav_Details != null && record.Nav_Details.Any() && details != null && details.Any()) @@ -71,7 +74,8 @@ namespace APT.SK.WebApi.Controllers.Api deleteDetailIds = record.Nav_Details.Select(t => t.ID).ToList(); deleteMeasureIds = this.GetEntities(t => deleteDetailIds.Contains(t.RISK_IDENTIFY_RESULT_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList(); deleteDepartIds = this.GetEntities(t => deleteDetailIds.Contains(t.RISK_IDENTIFY_RESULT_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList(); - deletePostIds = this.GetEntities(t => deleteDetailIds.Contains(t.RISK_IDENTIFY_RESULT_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList(); + deletePostIds = this.GetEntities(t => deleteDetailIds.Contains(t.RISK_IDENTIFY_RESULT_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList(); + deletePostDetailIds = this.GetEntities(t => deletePostIds.Contains(t.RISK_IDENTIFY_DETAIL_RESULT_POST_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList(); //record.Nav_Details.ForEach(t => //{ // if (t.Nav_DetailMeasures != null && t.Nav_DetailMeasures.Any()) @@ -104,39 +108,73 @@ namespace APT.SK.WebApi.Controllers.Api if (details != null && details.Any()) { foreach (var item in details) - { - item.ORG_ID = entity.ORG_ID; - item.RISK_IDENTIFY_RESULT_ID = entity.ID; + { + T_SK_RISK_IDENTIFY_RESULT_DETAIL de = new T_SK_RISK_IDENTIFY_RESULT_DETAIL(); + de.ORG_ID = entity.ORG_ID; + de.RISK_IDENTIFY_RESULT_ID = entity.ID; + de.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID; + de.AREA_ID = item.AREA_ID; + de.RISK_NAME = item.RISK_NAME; + de.RISK_DESCRIPTION = item.RISK_DESCRIPTION; + de.TYPE_ID = item.TYPE_ID; + de.ENABLE_STATUS = item.ENABLE_STATUS; + de.MARK = item.MARK; + de.EMERGENCY = item.EMERGENCY; + de.ENTERPRISE_LIBRARY_ID = item.ENTERPRISE_LIBRARY_ID; if (item.Nav_DetailMeasures != null && item.Nav_DetailMeasures.Any()) { - foreach (var item2 in item.Nav_DetailMeasures) + foreach (var mm in item.Nav_DetailMeasures) { + T_SK_RISK_IDENTIFY_DETAIL_RESULT_MEASURE item2 = new T_SK_RISK_IDENTIFY_DETAIL_RESULT_MEASURE(); item2.ORG_ID = entity.ORG_ID; - item2.RISK_IDENTIFY_RESULT_DETAIL_ID = item.ID; - measureList.Add(item2); + item2.RISK_IDENTIFY_RESULT_DETAIL_ID = de.ID; + item2.NUM = mm.NUM; + item2.MEASURE = mm.MEASURE; + measureList.Add(item2); + var temp = (item2.NUM == null || item2.NUM == 0) ? "1" : item2.NUM + "、" + item2.MEASURE + Environment.NewLine; + de.MEASURE = de.MEASURE + temp; } } + detailList.Add(de); item.Nav_DetailMeasures = null; if (item.Nav_DetailDeparts != null && item.Nav_DetailDeparts.Any()) { - foreach (var item2 in item.Nav_DetailDeparts) + foreach (var mm in item.Nav_DetailDeparts) { + T_SK_RISK_IDENTIFY_DETAIL_RESULT_DEPART item2 = new T_SK_RISK_IDENTIFY_DETAIL_RESULT_DEPART(); item2.ORG_ID = entity.ORG_ID; - item2.RISK_IDENTIFY_RESULT_DETAIL_ID = item.ID; + item2.RISK_IDENTIFY_RESULT_DETAIL_ID = de.ID; + item2.DEPARTMENT_TYPE = mm.DEPARTMENT_TYPE; + item2.DEPARTMENT_ID = mm.DEPARTMENT_ID; departList.Add(item2); } } item.Nav_DetailDeparts = null; if (item.Nav_DetailPosts != null && item.Nav_DetailPosts.Any()) { - foreach (var item2 in item.Nav_DetailPosts) + foreach (var mm in item.Nav_DetailPosts) { + T_SK_RISK_IDENTIFY_DETAIL_RESULT_POST item2 = new T_SK_RISK_IDENTIFY_DETAIL_RESULT_POST(); item2.ORG_ID = entity.ORG_ID; - item2.RISK_IDENTIFY_RESULT_DETAIL_ID = item.ID; + item2.RISK_IDENTIFY_RESULT_DETAIL_ID = de.ID; + item2.DEPARTMENT_TYPE = mm.DEPARTMENT_TYPE; + item2.DEPARTMENT_ID = mm.DEPARTMENT_ID; postList.Add(item2); + if (mm.Nav_ResultPostDets != null && mm.Nav_ResultPostDets.Any()) + { + foreach (var nn in mm.Nav_ResultPostDets) + { + T_SK_RISK_IDENTIFY_DETAIL_RESULT_POST_DETAIL item3 = new T_SK_RISK_IDENTIFY_DETAIL_RESULT_POST_DETAIL(); + item3.ORG_ID = entity.ORG_ID; + item3.RISK_IDENTIFY_DETAIL_RESULT_POST_ID = item2.ID; + item3.POST_ID = nn.POST_ID; + postDetailList.Add(item3); + } + } } } item.Nav_DetailPosts = null; + detailList.Add(de); } } if (files != null && files.Any()) @@ -179,15 +217,17 @@ namespace APT.SK.WebApi.Controllers.Api if (deleteMeasureIds != null && deleteMeasureIds.Any()) this.BantchDeleteEntityNoCommit(deleteMeasureIds); if (deleteDepartIds != null && deleteDepartIds.Any()) - this.BantchDeleteEntityNoCommit(deleteDepartIds); + this.BantchDeleteEntityNoCommit(deleteDepartIds); + if (deletePostDetailIds != null && deletePostDetailIds.Any()) + this.BantchDeleteEntityNoCommit(deletePostDetailIds); if (deletePostIds != null && deletePostIds.Any()) this.BantchDeleteEntityNoCommit(deletePostIds); if (deleteDetailIds != null && deleteDetailIds.Any()) this.BantchDeleteEntityNoCommit(deleteDetailIds); if (entity != null) UpdateEntityNoCommit(entity); - if (details != null && details.Any()) - BantchSaveEntityNoCommit(details); + if (detailList != null && detailList.Any()) + BantchSaveEntityNoCommit(detailList); if (files != null && files.Any()) BantchSaveEntityNoCommit(files); if (requires != null && requires.Any()) @@ -198,6 +238,8 @@ namespace APT.SK.WebApi.Controllers.Api BantchSaveEntityNoCommit(departList); if (postList != null && postList.Any()) BantchSaveEntityNoCommit(postList); + if (postDetailList != null && postDetailList.Any()) + BantchSaveEntityNoCommit(postDetailList); }, null, null, null, null, null, "SK035_SHOWPRINT", null, "安全风险辨识结果表审批"); return true; } @@ -206,15 +248,17 @@ namespace APT.SK.WebApi.Controllers.Api if (deleteMeasureIds != null && deleteMeasureIds.Any()) this.BantchDeleteEntityNoCommit(deleteMeasureIds); if (deleteDepartIds != null && deleteDepartIds.Any()) - this.BantchDeleteEntityNoCommit(deleteDepartIds); + this.BantchDeleteEntityNoCommit(deleteDepartIds); + if (deletePostDetailIds != null && deletePostDetailIds.Any()) + this.BantchDeleteEntityNoCommit(deletePostDetailIds); if (deletePostIds != null && deletePostIds.Any()) this.BantchDeleteEntityNoCommit(deletePostIds); if (deleteDetailIds != null && deleteDetailIds.Any()) this.BantchDeleteEntityNoCommit(deleteDetailIds); if (entity != null) UpdateEntityNoCommit(entity); - if (details != null && details.Any()) - BantchSaveEntityNoCommit(details); + if (detailList != null && detailList.Any()) + BantchSaveEntityNoCommit(detailList); if (files != null && files.Any()) BantchSaveEntityNoCommit(files); if (requires != null && requires.Any()) @@ -224,7 +268,9 @@ namespace APT.SK.WebApi.Controllers.Api if (departList != null && departList.Any()) BantchSaveEntityNoCommit(departList); if (postList != null && postList.Any()) - BantchSaveEntityNoCommit(postList); + BantchSaveEntityNoCommit(postList); + if (postDetailList != null && postDetailList.Any()) + BantchSaveEntityNoCommit(postDetailList); }); return true; }); diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyResultSummaryController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyResultSummaryController.cs index a459cbd..1fc763c 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyResultSummaryController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyResultSummaryController.cs @@ -52,50 +52,88 @@ namespace APT.SK.WebApi.Controllers.Api var files = entity.Nav_Files; entity.Nav_Files = null; entity.ApplyDepartmentName = this.GetEntity(t => t.ID == departId).NAME; - entity.ApplyPostName = this.GetEntity(t => t.ID == userId, "Nav_Person.Nav_Post")?.Nav_Person?.Nav_Post?.NAME; + entity.ApplyPostName = this.GetEntity(t => t.ID == userId, "Nav_Person.Nav_Post")?.Nav_Person?.Nav_Post?.NAME; + List detailIds = new List(); List deleteMeasureIds = new List(); List deleteDepartIds = new List(); - List deletePostIds = new List(); + List deletePostIds = new List(); + List deletePostDetailIds = new List(); + List detailList = new List(); List measureList = new List(); List departList = new List(); - List postList = new List(); + List postList = new List(); + List postDetailList = new List(); if (details != null && details.Any()) { - var detailIds = details.Select(t => t.ID).ToList(); + detailIds = this.GetEntities(t => t.IDENTIFY_RESULT_SUMMARY_ID == entity.ID, new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList(); deleteMeasureIds = this.GetEntities(t => detailIds.Contains(t.IDENTIFY_RESULT_SUMMARY_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList(); deleteDepartIds = this.GetEntities(t => detailIds.Contains(t.IDENTIFY_RESULT_SUMMARY_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList(); deletePostIds = this.GetEntities(t => detailIds.Contains(t.IDENTIFY_RESULT_SUMMARY_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList(); + deletePostDetailIds = this.GetEntities(t => deletePostIds.Contains(t.IDENTIFY_RESULT_SUMMARY_POST_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList(); foreach (var item in details) - { - item.ORG_ID = entity.ORG_ID; - item.IDENTIFY_RESULT_SUMMARY_ID = entity.ID; + { + T_SK_RISK_IDENTIFY_RESULT_SUMMARY_DETAIL de = new T_SK_RISK_IDENTIFY_RESULT_SUMMARY_DETAIL(); + de.ORG_ID = entity.ORG_ID; + de.IDENTIFY_RESULT_SUMMARY_ID = entity.ID; + de.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID; + de.AREA_ID = item.AREA_ID; + de.RISK_NAME = item.RISK_NAME; + de.RISK_DESCRIPTION = item.RISK_DESCRIPTION; + de.TYPE_ID = item.TYPE_ID; + de.ENABLE_STATUS = item.ENABLE_STATUS; + de.MARK = item.MARK; + de.EMERGENCY = item.EMERGENCY; + de.ENTERPRISE_LIBRARY_ID = item.ENTERPRISE_LIBRARY_ID; if (item.Nav_DetailMeasures != null && item.Nav_DetailMeasures.Any()) { - foreach (var item2 in item.Nav_DetailMeasures) + foreach (var mm in item.Nav_DetailMeasures) { + T_SK_RISK_IDENTIFY_RESULT_SUMMARY_MEASURE item2 = new T_SK_RISK_IDENTIFY_RESULT_SUMMARY_MEASURE(); item2.ORG_ID = entity.ORG_ID; - item2.IDENTIFY_RESULT_SUMMARY_DETAIL_ID = item.ID; - measureList.Add(item2); + item2.IDENTIFY_RESULT_SUMMARY_DETAIL_ID = de.ID; + item2.NUM = mm.NUM; + item2.MEASURE = mm.MEASURE; + measureList.Add(item2); + var temp = (item2.NUM == null || item2.NUM == 0) ? "1" : item2.NUM + "、" + item2.MEASURE + Environment.NewLine; + de.MEASURE = de.MEASURE + temp; } } + detailList.Add(de); item.Nav_DetailMeasures = null; if (item.Nav_DetailDeparts != null && item.Nav_DetailDeparts.Any()) { - foreach (var item2 in item.Nav_DetailDeparts) + foreach (var mm in item.Nav_DetailDeparts) { + T_SK_RISK_IDENTIFY_RESULT_SUMMARY_DEPART item2 = new T_SK_RISK_IDENTIFY_RESULT_SUMMARY_DEPART(); item2.ORG_ID = entity.ORG_ID; - item2.IDENTIFY_RESULT_SUMMARY_DETAIL_ID = item.ID; + item2.IDENTIFY_RESULT_SUMMARY_DETAIL_ID = de.ID; + item2.DEPARTMENT_TYPE = mm.DEPARTMENT_TYPE; + item2.DEPARTMENT_ID = mm.DEPARTMENT_ID; departList.Add(item2); } } item.Nav_DetailDeparts = null; if (item.Nav_DetailPosts != null && item.Nav_DetailPosts.Any()) { - foreach (var item2 in item.Nav_DetailPosts) + foreach (var mm in item.Nav_DetailPosts) { + T_SK_RISK_IDENTIFY_RESULT_SUMMARY_POST item2 = new T_SK_RISK_IDENTIFY_RESULT_SUMMARY_POST(); item2.ORG_ID = entity.ORG_ID; - item2.IDENTIFY_RESULT_SUMMARY_DETAIL_ID = item.ID; - postList.Add(item2); + item2.IDENTIFY_RESULT_SUMMARY_DETAIL_ID = de.ID; + item2.DEPARTMENT_TYPE = mm.DEPARTMENT_TYPE; + item2.DEPARTMENT_ID = mm.DEPARTMENT_ID; + postList.Add(item2); + if (mm.Nav_SumPostDets != null && mm.Nav_SumPostDets.Any()) + { + foreach (var nn in mm.Nav_SumPostDets) + { + T_SK_RISK_IDENTIFY_RESULT_SUMMARY_POST_DETAIL item3 = new T_SK_RISK_IDENTIFY_RESULT_SUMMARY_POST_DETAIL(); + item3.ORG_ID = entity.ORG_ID; + item3.IDENTIFY_RESULT_SUMMARY_POST_ID = item2.ID; + item3.POST_ID = nn.POST_ID; + postDetailList.Add(item3); + } + } } } item.Nav_DetailPosts = null; @@ -136,12 +174,16 @@ namespace APT.SK.WebApi.Controllers.Api this.BantchDeleteEntityNoCommit(deleteMeasureIds); if (deleteDepartIds != null && deleteDepartIds.Any()) this.BantchDeleteEntityNoCommit(deleteDepartIds); + if (deletePostDetailIds != null && deletePostDetailIds.Any()) + this.BantchDeleteEntityNoCommit(deletePostDetailIds); if (deletePostIds != null && deletePostIds.Any()) - this.BantchDeleteEntityNoCommit(deletePostIds); + this.BantchDeleteEntityNoCommit(deletePostIds); + if (detailIds != null && detailIds.Any()) + this.BantchDeleteEntityNoCommit(detailIds); if (entity != null) UpdateEntityNoCommit(entity); - if (details != null && details.Any()) - BantchSaveEntityNoCommit(details); + if (detailList != null && detailList.Any()) + BantchSaveEntityNoCommit(detailList); if (files != null && files.Any()) BantchSaveEntityNoCommit(files); if (requires != null && requires.Any()) @@ -151,7 +193,9 @@ namespace APT.SK.WebApi.Controllers.Api if (departList != null && departList.Any()) BantchSaveEntityNoCommit(departList); if (postList != null && postList.Any()) - BantchSaveEntityNoCommit(postList); + BantchSaveEntityNoCommit(postList); + if (postDetailList != null && postDetailList.Any()) + BantchSaveEntityNoCommit(postDetailList); }, null, null, null, null, null, "SK037_SHOWPRINT", null, "安全风险辨识结果汇总表审批"); return true; } @@ -160,13 +204,17 @@ namespace APT.SK.WebApi.Controllers.Api if (deleteMeasureIds != null && deleteMeasureIds.Any()) this.BantchDeleteEntityNoCommit(deleteMeasureIds); if (deleteDepartIds != null && deleteDepartIds.Any()) - this.BantchDeleteEntityNoCommit(deleteDepartIds); + this.BantchDeleteEntityNoCommit(deleteDepartIds); + if (deletePostDetailIds != null && deletePostDetailIds.Any()) + this.BantchDeleteEntityNoCommit(deletePostDetailIds); if (deletePostIds != null && deletePostIds.Any()) - this.BantchDeleteEntityNoCommit(deletePostIds); + this.BantchDeleteEntityNoCommit(deletePostIds); + if (detailIds != null && detailIds.Any()) + this.BantchDeleteEntityNoCommit(detailIds); if (entity != null) - UpdateEntityNoCommit(entity); - if (details != null && details.Any()) - BantchSaveEntityNoCommit(details); + UpdateEntityNoCommit(entity); + if (detailList != null && detailList.Any()) + BantchSaveEntityNoCommit(detailList); if (files != null && files.Any()) BantchSaveEntityNoCommit(files); if (requires != null && requires.Any()) @@ -176,7 +224,9 @@ namespace APT.SK.WebApi.Controllers.Api if (departList != null && departList.Any()) BantchSaveEntityNoCommit(departList); if (postList != null && postList.Any()) - BantchSaveEntityNoCommit(postList); + BantchSaveEntityNoCommit(postList); + if (postDetailList != null && postDetailList.Any()) + BantchSaveEntityNoCommit(postDetailList); }); return true; });