From a15062eaab0a7dc0e2a396dab11d3e93db371d4e 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, 26 Nov 2025 13:17:55 +0800 Subject: [PATCH] 2 --- .../Api/DoublePreventMechanismController.cs | 121 +++++------------- 1 file changed, 33 insertions(+), 88 deletions(-) diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/DoublePreventMechanismController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/DoublePreventMechanismController.cs index f661dbc..7910cb3 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/DoublePreventMechanismController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/DoublePreventMechanismController.cs @@ -79,11 +79,11 @@ namespace APT.SK.WebApi.Controllers.Api List basicList = new List(); if (details != null && details.Any()) { - var first = details.FirstOrDefault(t => t.AREA_ID != entity.RISK_AREA_ID); - if (first != null && entity.RISK_AREA_ID != null) - { - throw new Exception("主表的检查区域与子表的辨识区域需保持一致！"); - } + //var first = details.FirstOrDefault(t => t.AREA_ID != entity.RISK_AREA_ID); + //if (first != null && entity.RISK_AREA_ID != null) + //{ + // throw new Exception("主表的检查区域与子表的辨识区域需保持一致！"); + //} detailIds = this.GetEntities(t => t.DOUBLE_PREVENT_MECHANISM_ID == entity.ID, new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList(); detailPostIds = this.GetEntities(t => detailIds.Contains(t.DOUBLE_PREVENT_MECHANISM_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList(); measureIds = this.GetEntities(t => detailIds.Contains(t.DOUBLE_PREVENT_MECHANISM_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList(); @@ -167,34 +167,34 @@ namespace APT.SK.WebApi.Controllers.Api detailPostList.Add(item2); } } - if (item.EVALUATE_LEVEL == SKEvaluateLevelEnum.重大风险) - { - if (!departType.Contains("公司级")) - { - throw new Exception(item.RISK_NAME + "，重大风险管控层级必须包含公司级"); - } - } - if (item.EVALUATE_LEVEL == SKEvaluateLevelEnum.较大风险) - { - if (!departType.Contains("部门级") && !departType.Contains("公司级")) - { - throw new Exception(item.RISK_NAME + "，较大风险管控层级必须大于部门级"); - } - } - if (item.EVALUATE_LEVEL == SKEvaluateLevelEnum.一般风险) - { - if (!departType.Contains("部门级") && !departType.Contains("公司级") && !departType.Contains("车间级")) - { - throw new Exception(item.RISK_NAME + "，一般风险管控层级必须大于车间级"); - } - } - if (item.EVALUATE_LEVEL == SKEvaluateLevelEnum.低风险) - { - if (!departType.Contains("部门级") && !departType.Contains("公司级") && !departType.Contains("车间级") && !departType.Contains("班组级")) - { - throw new Exception(item.RISK_NAME + "，低风险管控层级必须大于班组级"); - } - } + //if (item.EVALUATE_LEVEL == SKEvaluateLevelEnum.重大风险) + //{ + // if (!departType.Contains("公司级")) + // { + // throw new Exception(item.RISK_NAME + "，重大风险管控层级必须包含公司级"); + // } + //} + //if (item.EVALUATE_LEVEL == SKEvaluateLevelEnum.较大风险) + //{ + // if (!departType.Contains("部门级") && !departType.Contains("公司级")) + // { + // throw new Exception(item.RISK_NAME + "，较大风险管控层级必须大于部门级"); + // } + //} + //if (item.EVALUATE_LEVEL == SKEvaluateLevelEnum.一般风险) + //{ + // if (!departType.Contains("部门级") && !departType.Contains("公司级") && !departType.Contains("车间级")) + // { + // throw new Exception(item.RISK_NAME + "，一般风险管控层级必须大于车间级"); + // } + //} + //if (item.EVALUATE_LEVEL == SKEvaluateLevelEnum.低风险) + //{ + // if (!departType.Contains("部门级") && !departType.Contains("公司级") && !departType.Contains("车间级") && !departType.Contains("班组级")) + // { + // throw new Exception(item.RISK_NAME + "，低风险管控层级必须大于班组级"); + // } + //} if (item.Nav_DetailDeparts != null && item.Nav_DetailDeparts.Any()) { foreach (var item2 in item.Nav_DetailDeparts) @@ -271,50 +271,22 @@ namespace APT.SK.WebApi.Controllers.Api BantchSaveEntityNoCommit(files); if (details != null && details.Any()) BantchSaveEntityNoCommit(details); - else - { - throw new Exception("风险明细不能为空"); - } if (detailPostList != null && detailPostList.Any()) BantchSaveEntityNoCommit(detailPostList); - else - { - throw new Exception("管控层级明细不能为空"); - } if (detailDepartList != null && detailDepartList.Any()) BantchSaveEntityNoCommit(detailDepartList); - else - { - throw new Exception("辨识岗位明细不能为空"); - } if (departDetailList != null && departDetailList.Any()) BantchSaveEntityNoCommit(departDetailList); if (measureList != null && measureList.Any()) BantchSaveEntityNoCommit(measureList); - else - { - throw new Exception("管控措施明细不能为空"); - } if (contentList != null && contentList.Any()) BantchSaveEntityNoCommit(contentList); - else - { - throw new Exception("检查内容明细不能为空"); - } if (hiddenList != null && hiddenList.Any()) BantchSaveEntityNoCommit(hiddenList); - else - { - throw new Exception("隐患明细不能为空"); - } if (basicList != null && basicList.Any()) BantchSaveEntityNoCommit(basicList); if (postList != null && postList.Any()) BantchSaveEntityNoCommit(postList); - else - { - throw new Exception("检查层级明细不能为空"); - } if (departList != null && departList.Any()) BantchSaveEntityNoCommit(departList); }, null, null, null, null, null, "SK026_SHOWPRINT", null, "风险检查关联表审批"); @@ -350,49 +322,22 @@ namespace APT.SK.WebApi.Controllers.Api BantchSaveEntityNoCommit(files); if (details != null && details.Any()) BantchSaveEntityNoCommit(details); - else - { - throw new Exception("风险明细不能为空"); - } if (detailPostList != null && detailPostList.Any()) BantchSaveEntityNoCommit(detailPostList); - else - { - throw new Exception("管控层级明细不能为空"); - } if (detailDepartList != null && detailDepartList.Any()) BantchSaveEntityNoCommit(detailDepartList); - else - { - throw new Exception("辨识岗位明细不能为空"); - } if (departDetailList != null && departDetailList.Any()) BantchSaveEntityNoCommit(departDetailList); if (measureList != null && measureList.Any()) BantchSaveEntityNoCommit(measureList); - else - { - throw new Exception("管控措施明细不能为空"); - } if (contentList != null && contentList.Any()) BantchSaveEntityNoCommit(contentList); - else - { - throw new Exception("检查内容明细不能为空"); - } if (hiddenList != null && hiddenList.Any()) BantchSaveEntityNoCommit(hiddenList); - { - throw new Exception("隐患明细不能为空"); - } if (basicList != null && basicList.Any()) BantchSaveEntityNoCommit(basicList); if (postList != null && postList.Any()) BantchSaveEntityNoCommit(postList); - else - { - throw new Exception("检查层级明细不能为空"); - } if (departList != null && departList.Any()) BantchSaveEntityNoCommit(departList); });