From c2d0982364f5f639afa616d1c6a3a60424614572 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, 7 Sep 2026 14:21:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A3=8E=E9=99=A9=E8=AF=84?= =?UTF-8?q?=E4=BC=B0=E8=A1=A8=E5=88=A4=E6=96=AD=E4=BF=AE=E6=94=B9=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Api/RiskEvaluationController.cs | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationController.cs index db9ebbe..b6704f4 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationController.cs @@ -82,7 +82,7 @@ namespace APT.SK.WebApi.Controllers.Api if (item.MARK == SKMarkEnum.Auto) { //&& t.RISK_DESCRIPTION == item.RISK_DESCRIPTION && t.EMERGENCY == item.EMERGENCY && t.ENABLE_STATUS == item.ENABLE_STATUS - var temp = record.Nav_Details.FirstOrDefault(t => t.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && t.AREA_ID == item.AREA_ID && t.TYPE_ID == item.TYPE_ID && t.RISK_NAME == item.RISK_NAME); + var temp = record.Nav_Details.FirstOrDefault(t => t.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && t.AREA_ID == item.AREA_ID && t.TYPE_ID == item.TYPE_ID && t.RISK_NAME == item.RISK_NAME && t.SCOREC_ID==item.SCOREC_ID && t.SCOREE_ID == item.SCOREE_ID && t.SCOREL_ID == item.SCOREL_ID); if (temp == null) { item.MARK = SKMarkEnum.Update; @@ -94,17 +94,17 @@ namespace APT.SK.WebApi.Controllers.Api //{ // item.MARK = SKMarkEnum.Update; //} - //if (item.Nav_DetailMeasures != null && item.Nav_DetailMeasures.Any()) - //{ - // foreach (var mes in item.Nav_DetailMeasures) - // { - // var newMes = detailMes.FirstOrDefault(t => t.MEASURES_NAME == mes.MEASURES_NAME && t.RISK_EVALUATION_DETAIL_ID == item.ID); - // if (newMes == null && item.MARK != SKMarkEnum.Add) - // { - // item.MARK = SKMarkEnum.Update; - // } - // } - //} + if (item.Nav_DetailMeasures != null && item.Nav_DetailMeasures.Any()) + { + foreach (var mes in item.Nav_DetailMeasures) + { + var newMes = detailMes.FirstOrDefault(t => t.MEASURES_NAME == mes.MEASURES_NAME && t.RISK_EVALUATION_DETAIL_ID == item.ID); + if (newMes == null && item.MARK != SKMarkEnum.Add) + { + item.MARK = SKMarkEnum.Update; + } + } + } } //record.Nav_Details.ForEach(t => //{