From 03033d355b03225ae3aa21b4d8f468339e4c7a70 Mon Sep 17 00:00:00 2001 From: wyw <571921741@qq.com> Date: Fri, 26 Jul 2024 13:49:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E6=9F=A5=E7=99=BB=E8=AE=B0=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E3=80=90=E6=97=A0=E3=80=91=20=E5=81=9A?= =?UTF-8?q?=E5=88=A4=E6=96=AD=20=E9=9A=90=E6=82=A3=E4=B8=8A=E6=8A=A5=20?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E7=AD=89=E7=BA=A7=20=E5=8F=96=E5=80=BC=20=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=A3=80=E6=9F=A5=E9=97=AE=E9=A2=98=20=20?= =?UTF-8?q?=E6=A3=80=E6=9F=A5=E8=8C=83=E5=9B=B4=20=20=E5=A6=82=E6=9E=9C?= =?UTF-8?q?=E6=98=AF=20=E5=85=A8=E5=85=AC=E5=8F=B8=20=E4=B8=8D=E5=81=9A?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=BD=93=20=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Api/BSCheckQuestionController.cs | 6 +++++- .../Controllers/Api/BSRiskSubmitController.cs | 5 ++++- .../Controllers/Api/BSSafeCheckController.cs | 8 +++++++- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSCheckQuestionController.cs b/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSCheckQuestionController.cs index a60380f..ae7ffcb 100644 --- a/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSCheckQuestionController.cs +++ b/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSCheckQuestionController.cs @@ -163,8 +163,12 @@ namespace APT.BS.WebApi.Controllers.Api { #region 如果数据库中未查找到 到 T_BS_CHECK_CONTENTS 去查找 + Expression> expressionC = e => e.CHECKCONTENT == CHECKCONTENT; + if (CHECKOBJECT != null && CHECKOBJECT != BSMineTypeEnum.All) + expressionC = expressionC.And(e => e.CHECKOBJECT == CHECKOBJECT); + + var contents = GetEntities(expressionC, null, null); - var contents = GetEntities(e => e.CHECKCONTENT == CHECKCONTENT && e.CHECKOBJECT == CHECKOBJECT, null, null); if (contents != null && contents.Any()) { Expression> expressionQ = e => !e.IS_DELETED; diff --git a/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSRiskSubmitController.cs b/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSRiskSubmitController.cs index 954f880..3327a34 100644 --- a/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSRiskSubmitController.cs +++ b/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSRiskSubmitController.cs @@ -390,7 +390,10 @@ namespace APT.BS.WebApi.Controllers.Api model.CHECKCONTENT = item.CHECKCONTENT; model.SAFE_CHECK_DETAIL_ID = model.Nav_SafeCheckDetail.ID; - model.QUESTION_LEVEL = item.QUESTION_LEVEL.HasValue ? item.QUESTION_LEVEL.Value : item.Nav_CheckMain.QUESTION_LEVEL;//默认等级和原来一致 + if (model.QUESTION_LEVEL == 0) + { + model.QUESTION_LEVEL = item.QUESTION_LEVEL.HasValue ? item.QUESTION_LEVEL.Value : ((int)itemQ.Nav_Question.QUESTION_LEVEL);//默认等级和原来一致 + } model.QUESTION_LEVEL_SHOW = model.QUESTION_LEVEL > 0 ? ((BSQuestionLevelEnum)(model.QUESTION_LEVEL)).GetDescription() : "";//默认等级和原来一致 model.RISK_AREA_ID = item.RISK_AREA_ID; diff --git a/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSSafeCheckController.cs b/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSSafeCheckController.cs index e230b8e..7fa781d 100644 --- a/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSSafeCheckController.cs +++ b/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSSafeCheckController.cs @@ -3755,7 +3755,7 @@ namespace APT.BS.WebApi.Controllers.Api //}); } - + T_BS_SAFE_CHECK_DETAIL_QUESTION autoAddWu = null; foreach (var item in listDetail) { if (item.CHECKRESULT.HasValue && item.CHECKRESULT.Value != 10 && item.CHECKRESULT.Value != 0) @@ -3764,6 +3764,12 @@ namespace APT.BS.WebApi.Controllers.Api continue;//有检查问题 直接返回 } + autoAddWu = item.Nav_ListCheckDetailQuestion.FirstOrDefault(e => e.SAFE_CHECK_QUESTION_ID == guidWu); + if (autoAddWu != null && autoAddWu.ID != Guid.Empty) + { + continue;//有检查问题 直接返回 + } + item.ISAUTOLOAD = true; QuestionWU = new T_BS_SAFE_CHECK_DETAIL_QUESTION(); QuestionWU.ID = Guid.NewGuid();