diff --git a/APT.BaseData.Services/Services/FM/FMFlowPermitService.cs b/APT.BaseData.Services/Services/FM/FMFlowPermitService.cs
index c54f4e6..48e4a17 100644
--- a/APT.BaseData.Services/Services/FM/FMFlowPermitService.cs
+++ b/APT.BaseData.Services/Services/FM/FMFlowPermitService.cs
@@ -1844,19 +1844,26 @@ namespace APT.BaseData.Services.Services.FM
else
{
//非最后节点
- if (curentApprove == null)
+ if (curentApprove == null)//本节点没数据了
{
//找下一个审批节点
- curentApprove = appdetails.FirstOrDefault(e => e.NUM == (approveOperater.NUM + 1));
+ //curentApprove = appdetails.FirstOrDefault(e => e.NUM == (approveOperater.NUM + 1));
+ var appdetailsMore = appdetails.FindAll(e => e.NUM > approveOperater.NUM).OrderBy(e => e.NUM);
+ if (appdetailsMore != null && appdetailsMore.Any())
+ {
+ curentApprove = appdetailsMore.ToList()[0];
+ }
}
}
-
- //删除 前面的节点
- for (int i = appdetails.Count - 1; i > -1; i--)
+ if (approveOperater.NUM > 1)
{
- if (appdetails[i].NUM < approveOperater.NUM)
+ //删除 前面的节点
+ for (int i = appdetails.Count - 1; i > -1; i--)
{
- appdetails.Remove(appdetails[i]);
+ if (appdetails[i].NUM < approveOperater.NUM)
+ {
+ appdetails.Remove(appdetails[i]);
+ }
}
}
}
diff --git a/APT.MS.Domain/Enums/BS/BSEnums.cs b/APT.MS.Domain/Enums/BS/BSEnums.cs
index 7c19f7d..13296aa 100644
--- a/APT.MS.Domain/Enums/BS/BSEnums.cs
+++ b/APT.MS.Domain/Enums/BS/BSEnums.cs
@@ -551,12 +551,17 @@ namespace APT.MS.Domain.Enums
///
public enum CHECKRESULTEnum
{
+ //
+ /// 符合要求 10
+ ///
+ [Description("符合要求")]
+ None = 10,
//
- /// 无 10
+ /// 缺项 15
///
- [Description("无")]
- None = 10,
+ [Description("缺项")]
+ Empty = 15,
//
/// 与问题描述一致 20
diff --git a/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSCheckQuestionController.cs b/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSCheckQuestionController.cs
index ae7ffcb..9cd8e54 100644
--- a/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSCheckQuestionController.cs
+++ b/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSCheckQuestionController.cs
@@ -30,7 +30,7 @@ namespace APT.BS.WebApi.Controllers.Api
List listID = new List();
listID.Add(new Guid("55555555-5555-5555-5555-555555555555"));
- //listID.Add(new Guid("77777777-7777-7777-7777-777777777777"));//去除其他
+ listID.Add(new Guid("66666666-6666-6666-6666-666666666666"));//去除其他
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/BSRiskSubmitController.cs b/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSRiskSubmitController.cs
index 25cbdaf..bc22612 100644
--- a/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSRiskSubmitController.cs
+++ b/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSRiskSubmitController.cs
@@ -243,7 +243,7 @@ namespace APT.BS.WebApi.Controllers.Api
}
}
- List listQID = new List() { new Guid("55555555-5555-5555-5555-555555555555") };
+ List listQID = new List() { new Guid("55555555-5555-5555-5555-555555555555"), new Guid("66666666-6666-6666-6666-666666666666") };
//责任部门
List listDep = new List();
diff --git a/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSSafeCheckController.cs b/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSSafeCheckController.cs
index c4d177f..0f0ee38 100644
--- a/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSSafeCheckController.cs
+++ b/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSSafeCheckController.cs
@@ -3023,7 +3023,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)
+ if (item.CHECKRESULT.HasValue && (item.CHECKRESULT.Value == 10 || item.CHECKRESULT.Value == 15))
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() : "";
@@ -3948,6 +3948,7 @@ namespace APT.BS.WebApi.Controllers.Api
string Msg = string.Empty;
List emptyResult = new List();//需要登录者填，但是登录者没填的提示
List Set555 = new List();//没问题 但是有填写的
+ List Set666 = new List();//没问题 但是有填写的
List OtherNoRemarkResult = new List();//需要登录者填，但是登录者选择其他，但是没选问题等级或者备注
List NeedCheckResult = new List();//需要确认但是没有确认的
List NeedCheckQuestionMore = new List();//检查问题多选
@@ -3978,8 +3979,9 @@ namespace APT.BS.WebApi.Controllers.Api
List listNoticeUserID = new List();//给相关次要负责人 添加待办
List listNoticeUserNAME = new List();
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, guid7 };
+ List listGuid = new List { guid5, guid6, guid7 };
List listIDDel = new List();//需要删除的检查问题描述ID
@@ -4056,6 +4058,14 @@ namespace APT.BS.WebApi.Controllers.Api
Set555.Add(i + 1);
}
}
+ else if (item.SAFE_CHECK_QUESTION_ID == guid6)
+ {
+ listDetail[i].CHECKRESULT = 15;
+ if (listDetail[i].QUESTION_LEVEL.HasValue && listDetail[i].QUESTION_LEVEL > 0)
+ {
+ Set666.Add(i + 1);
+ }
+ }
else if (item.SAFE_CHECK_QUESTION_ID == guid7)
{
listDetail[i].CHECKRESULT = 30;
@@ -4136,7 +4146,7 @@ namespace APT.BS.WebApi.Controllers.Api
// listEmptyAddress.Add(i + 1);
//}
- if (listDetail[i].Nav_CheckQuestion?.ID != guid5 && listDetail[i].Nav_ListCheckDetailReason != null && listDetail[i].Nav_ListCheckDetailReason.Any())
+ if (listDetail[i].Nav_CheckQuestion?.ID != guid5 && listDetail[i].Nav_CheckQuestion?.ID != guid6 && listDetail[i].Nav_ListCheckDetailReason != null && listDetail[i].Nav_ListCheckDetailReason.Any())
{
if (listDetailReason == null)
{
@@ -4238,6 +4248,10 @@ namespace APT.BS.WebApi.Controllers.Api
{
Msg += (string.IsNullOrEmpty(Msg) ? "" : ",") + "子项【" + string.Join(",", Set555) + "】问题等级必须为空";
}
+ if (Set666.Count > 0)
+ {
+ Msg += (string.IsNullOrEmpty(Msg) ? "" : ",") + "子项【" + string.Join(",", Set666) + "】问题等级必须为空";
+ }
if (OtherNoRemarkResult.Count > 0)
{
Msg += (string.IsNullOrEmpty(Msg) ? "请" : ",") + "填写子项【" + string.Join(",", OtherNoRemarkResult) + "】问题描述为【其他】的问题等级和备注";
@@ -4267,6 +4281,10 @@ namespace APT.BS.WebApi.Controllers.Api
{
Msg += (string.IsNullOrEmpty(Msg) ? "" : ",") + "行【" + string.Join(",", Set555) + "】问题等级必须为空";
}
+ if (Set666.Count > 0)
+ {
+ Msg += (string.IsNullOrEmpty(Msg) ? "" : ",") + "行【" + string.Join(",", Set666) + "】问题等级必须为空";
+ }
if (OtherNoRemarkResult.Count > 0)
{
Msg += (string.IsNullOrEmpty(Msg) ? "请" : ",") + "填写行【" + string.Join(",", OtherNoRemarkResult) + "】问题描述为【其他】的问题等级和备注";