wyw/mh_lcmk_sms_service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

检查登记 添加【无】 做判断

Browse Source 
隐患上报 问题等级 取值  修改
检查问题  检查范围  如果是 全公司 不做生产当 过滤
This commit is contained in:
wyw 2024-07-26 13:49:43 +08:00
parent 382ee8b55c
commit 03033d355b
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSCheckQuestionController.cs
View File

@ -163,8 +163,12 @@ namespace APT.BS.WebApi.Controllers.Api
{ {
#region 如果数据库中未查找到 到 T_BS_CHECK_CONTENTS 去查找 #region 如果数据库中未查找到 到 T_BS_CHECK_CONTENTS 去查找
Expression<Func<T_BS_CHECK_CONTENTS, bool>> expressionC = e => e.CHECKCONTENT == CHECKCONTENT;
if (CHECKOBJECT != null && CHECKOBJECT != BSMineTypeEnum.All)
expressionC = expressionC.And(e => e.CHECKOBJECT == CHECKOBJECT);
var contents = GetEntities<T_BS_CHECK_CONTENTS>(expressionC, null, null);
var contents = GetEntities<T_BS_CHECK_CONTENTS>(e => e.CHECKCONTENT == CHECKCONTENT && e.CHECKOBJECT == CHECKOBJECT, null, null);
if (contents != null && contents.Any()) if (contents != null && contents.Any())
{ {
Expression<Func<T_BS_CHECK_QUESTION, bool>> expressionQ = e => !e.IS_DELETED; Expression<Func<T_BS_CHECK_QUESTION, bool>> expressionQ = e => !e.IS_DELETED;

5
APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSRiskSubmitController.cs
View File

@ -390,7 +390,10 @@ namespace APT.BS.WebApi.Controllers.Api
model.CHECKCONTENT = item.CHECKCONTENT; model.CHECKCONTENT = item.CHECKCONTENT;
model.SAFE_CHECK_DETAIL_ID = model.Nav_SafeCheckDetail.ID; 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.QUESTION_LEVEL_SHOW = model.QUESTION_LEVEL > 0 ? ((BSQuestionLevelEnum)(model.QUESTION_LEVEL)).GetDescription() : "";//默认等级和原来一致
model.RISK_AREA_ID = item.RISK_AREA_ID; model.RISK_AREA_ID = item.RISK_AREA_ID;

8
APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSSafeCheckController.cs
View File

@ -3755,7 +3755,7 @@ namespace APT.BS.WebApi.Controllers.Api
//}); //});
} }
T_BS_SAFE_CHECK_DETAIL_QUESTION autoAddWu = null;
foreach (var item in listDetail) foreach (var item in listDetail)
{ {
if (item.CHECKRESULT.HasValue && item.CHECKRESULT.Value != 10 && item.CHECKRESULT.Value != 0) if (item.CHECKRESULT.HasValue && item.CHECKRESULT.Value != 10 && item.CHECKRESULT.Value != 0)
@ -3764,6 +3764,12 @@ namespace APT.BS.WebApi.Controllers.Api
continue;//有检查问题 直接返回 continue;//有检查问题 直接返回
} }
autoAddWu = item.Nav_ListCheckDetailQuestion.FirstOrDefault(e => e.SAFE_CHECK_QUESTION_ID == guidWu);
if (autoAddWu != null && autoAddWu.ID != Guid.Empty)
{
continue;//有检查问题 直接返回
}
item.ISAUTOLOAD = true; item.ISAUTOLOAD = true;
QuestionWU = new T_BS_SAFE_CHECK_DETAIL_QUESTION(); QuestionWU = new T_BS_SAFE_CHECK_DETAIL_QUESTION();
QuestionWU.ID = Guid.NewGuid(); QuestionWU.ID = Guid.NewGuid();