diff --git a/APT.MS.Domain/Enums/BS/BSEnums.cs b/APT.MS.Domain/Enums/BS/BSEnums.cs index 12b1db7..6e362c2 100644 --- a/APT.MS.Domain/Enums/BS/BSEnums.cs +++ b/APT.MS.Domain/Enums/BS/BSEnums.cs @@ -563,6 +563,18 @@ namespace APT.MS.Domain.Enums [Description("缺项")] Empty = 15, + // + /// 不存在 16 + /// + [Description("不存在")] + None2 = 16, + + // + /// 不涉及 17 + /// + [Description("不涉及")] + None3 = 17, + // /// 不符合规定 20 /// diff --git a/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSCheckQuestionController.cs b/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSCheckQuestionController.cs index 9cd8e54..d7367c5 100644 --- a/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSCheckQuestionController.cs +++ b/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSCheckQuestionController.cs @@ -31,6 +31,8 @@ namespace APT.BS.WebApi.Controllers.Api List listID = new List(); listID.Add(new Guid("55555555-5555-5555-5555-555555555555")); listID.Add(new Guid("66666666-6666-6666-6666-666666666666"));//去除其他 + listID.Add(new Guid("88888888-8888-8888-8888-888888888888"));//去除其他 + listID.Add(new Guid("99999999-9999-9999-9999-999999999999"));//去除其他 var listQues2 = GetEntities(e => listID.Contains(e.ID), null, null); if (pageFilter.FilterGroup.Groups.Count > 0) diff --git a/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSSafeCheckController.cs b/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSSafeCheckController.cs index 17aa033..304deb7 100644 --- a/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSSafeCheckController.cs +++ b/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSSafeCheckController.cs @@ -3170,7 +3170,7 @@ namespace APT.BS.WebApi.Controllers.Api if (item.CHECKRESULT.HasValue && item.CHECKRESULT > 0) { //item.CHECKRESULT_DESCRIPTION = ((CHECKRESULTEnum)item.CHECKRESULT).GetDescription(); - if (item.CHECKRESULT.HasValue && (item.CHECKRESULT.Value == 10 || item.CHECKRESULT.Value == 15)) + if (item.CHECKRESULT.HasValue && (item.CHECKRESULT.Value == 10 || item.CHECKRESULT.Value == 15 || item.CHECKRESULT.Value == 16 || item.CHECKRESULT.Value == 17)) item.CHECKRESULT_DESCRIPTION = ((CHECKRESULTEnum)item.CHECKRESULT).GetDescription(); // 与问题描述一致 20 其它 30 等直接显示明细的 item.QUESTION_LEVEL_DESCRIPTION = (item.QUESTION_LEVEL.HasValue && item.QUESTION_LEVEL != 0) ? ((BSQuestionLevelEnum)item.QUESTION_LEVEL).GetDescription() : ""; @@ -4096,6 +4096,8 @@ namespace APT.BS.WebApi.Controllers.Api List emptyResult = new List();//需要登录者填,但是登录者没填的提示 List Set555 = new List();//没问题 但是有填写的 List Set666 = new List();//没问题 但是有填写的 + List Set888 = new List();//没问题 但是有填写的 + List Set999 = new List();//没问题 但是有填写的 List OtherNoRemarkResult = new List();//需要登录者填,但是登录者选择其他,但是没选问题等级或者备注 List NeedCheckResult = new List();//需要确认但是没有确认的 List NeedCheckQuestionMore = new List();//检查问题多选 @@ -4128,7 +4130,9 @@ namespace APT.BS.WebApi.Controllers.Api Guid guid5 = new Guid("55555555-5555-5555-5555-555555555555"); Guid guid6 = new Guid("66666666-6666-6666-6666-666666666666"); Guid guid7 = new Guid("77777777-7777-7777-7777-777777777777"); - List listGuid = new List { guid5, guid6, guid7 }; + Guid guid8 = new Guid("88888888-8888-8888-8888-888888888888"); + Guid guid9 = new Guid("99999999-9999-9999-9999-999999999999"); + List listGuid = new List { guid5, guid6, guid7, guid8, guid9 }; List listIDDel = new List();//需要删除的检查问题描述ID @@ -4222,6 +4226,22 @@ namespace APT.BS.WebApi.Controllers.Api listEmptyAddress.Add(i + 1); } } + else if (item.SAFE_CHECK_QUESTION_ID == guid8) + { + listDetail[i].CHECKRESULT = 16; + if (listDetail[i].QUESTION_LEVEL.HasValue && listDetail[i].QUESTION_LEVEL > 0) + { + Set888.Add(i + 1); + } + } + else if (item.SAFE_CHECK_QUESTION_ID == guid9) + { + listDetail[i].CHECKRESULT = 17; + if (listDetail[i].QUESTION_LEVEL.HasValue && listDetail[i].QUESTION_LEVEL > 0) + { + Set999.Add(i + 1); + } + } else { listDetail[i].CHECKRESULT = 20; @@ -4399,6 +4419,14 @@ namespace APT.BS.WebApi.Controllers.Api { Msg += (string.IsNullOrEmpty(Msg) ? "" : ",") + "子项【" + string.Join(",", Set666) + "】问题等级必须为空"; } + if (Set888.Count > 0) + { + Msg += (string.IsNullOrEmpty(Msg) ? "" : ",") + "子项【" + string.Join(",", Set888) + "】问题等级必须为空"; + } + if (Set999.Count > 0) + { + Msg += (string.IsNullOrEmpty(Msg) ? "" : ",") + "子项【" + string.Join(",", Set999) + "】问题等级必须为空"; + } if (OtherNoRemarkResult.Count > 0) { Msg += (string.IsNullOrEmpty(Msg) ? "请" : ",") + "填写子项【" + string.Join(",", OtherNoRemarkResult) + "】问题描述为【其他】的问题等级和备注"; @@ -4432,6 +4460,14 @@ namespace APT.BS.WebApi.Controllers.Api { Msg += (string.IsNullOrEmpty(Msg) ? "" : ",") + "行【" + string.Join(",", Set666) + "】问题等级必须为空"; } + if (Set888.Count > 0) + { + Msg += (string.IsNullOrEmpty(Msg) ? "" : ",") + "行【" + string.Join(",", Set888) + "】问题等级必须为空"; + } + if (Set999.Count > 0) + { + Msg += (string.IsNullOrEmpty(Msg) ? "" : ",") + "行【" + string.Join(",", Set999) + "】问题等级必须为空"; + } if (OtherNoRemarkResult.Count > 0) { Msg += (string.IsNullOrEmpty(Msg) ? "请" : ",") + "填写行【" + string.Join(",", OtherNoRemarkResult) + "】问题描述为【其他】的问题等级和备注";