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

1、审批找人 刚好有默认审批+顺序不连贯引起的的bug处理

Browse Source 
2、检查登记 检查内容 添加固定项【缺项】下拉
3、检查结果 添加 缺项 对应的固定值
4、修改检查结果 取值
5、隐患上报 条目获取 取数据修改（缺项 不上报）
This commit is contained in:
wyw 2024-09-26 16:34:19 +08:00
parent 98bff78324
commit 5d3e6758d7
5 changed files with 45 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
APT.BaseData.Services/Services/FM/FMFlowPermitService.cs
View File

@ -1844,19 +1844,26 @@ namespace APT.BaseData.Services.Services.FM
else 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];
}
} }
} }
if (approveOperater.NUM > 1)
//删除 前面的节点
for (int i = appdetails.Count - 1; i > -1; i--)
{ {
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]);
}
} }
} }
} }

11
APT.MS.Domain/Enums/BS/BSEnums.cs
View File

@ -551,12 +551,17 @@ namespace APT.MS.Domain.Enums
/// </summary> /// </summary>
public enum CHECKRESULTEnum public enum CHECKRESULTEnum
{ {
// <summary>
/// 符合要求 10
/// </summary>
[Description("符合要求")]
None = 10,
// <summary> // <summary>
/// 无 10 /// 缺项 15
/// </summary> /// </summary>
[Description("无")] [Description("缺项")]
None = 10, Empty = 15,
// <summary> // <summary>
/// 与问题描述一致 20 /// 与问题描述一致 20

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

@ -30,7 +30,7 @@ namespace APT.BS.WebApi.Controllers.Api
List<Guid> listID = new List<Guid>(); List<Guid> listID = new List<Guid>();
listID.Add(new Guid("55555555-5555-5555-5555-555555555555")); 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<T_BS_CHECK_QUESTION>(e => listID.Contains(e.ID), null, null); var listQues2 = GetEntities<T_BS_CHECK_QUESTION>(e => listID.Contains(e.ID), null, null);
if (pageFilter.FilterGroup.Groups.Count > 0) if (pageFilter.FilterGroup.Groups.Count > 0)

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

@ -243,7 +243,7 @@ namespace APT.BS.WebApi.Controllers.Api
} }
} }
List<Guid> listQID = new List<Guid>() { new Guid("55555555-5555-5555-5555-555555555555") }; List<Guid> listQID = new List<Guid>() { new Guid("55555555-5555-5555-5555-555555555555"), new Guid("66666666-6666-6666-6666-666666666666") };
//责任部门 //责任部门
List<T_FM_DEPARTMENT> listDep = new List<T_FM_DEPARTMENT>(); List<T_FM_DEPARTMENT> listDep = new List<T_FM_DEPARTMENT>();

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

@ -3023,7 +3023,7 @@ namespace APT.BS.WebApi.Controllers.Api
if (item.CHECKRESULT.HasValue && item.CHECKRESULT > 0) if (item.CHECKRESULT.HasValue && item.CHECKRESULT > 0)
{ {
//item.CHECKRESULT_DESCRIPTION = ((CHECKRESULTEnum)item.CHECKRESULT).GetDescription(); //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.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() : ""; 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; string Msg = string.Empty;
List<int> emptyResult = new List<int>();//需要登录者填，但是登录者没填的提示 List<int> emptyResult = new List<int>();//需要登录者填，但是登录者没填的提示
List<int> Set555 = new List<int>();//没问题 但是有填写的 List<int> Set555 = new List<int>();//没问题 但是有填写的
List<int> Set666 = new List<int>();//没问题 但是有填写的
List<int> OtherNoRemarkResult = new List<int>();//需要登录者填，但是登录者选择其他，但是没选问题等级或者备注 List<int> OtherNoRemarkResult = new List<int>();//需要登录者填，但是登录者选择其他，但是没选问题等级或者备注
List<int> NeedCheckResult = new List<int>();//需要确认但是没有确认的 List<int> NeedCheckResult = new List<int>();//需要确认但是没有确认的
List<int> NeedCheckQuestionMore = new List<int>();//检查问题多选 List<int> NeedCheckQuestionMore = new List<int>();//检查问题多选
@ -3978,8 +3979,9 @@ namespace APT.BS.WebApi.Controllers.Api
List<Guid> listNoticeUserID = new List<Guid>();//给相关次要负责人 添加待办 List<Guid> listNoticeUserID = new List<Guid>();//给相关次要负责人 添加待办
List<string> listNoticeUserNAME = new List<string>(); List<string> listNoticeUserNAME = new List<string>();
Guid guid5 = new Guid("55555555-5555-5555-5555-555555555555"); 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"); Guid guid7 = new Guid("77777777-7777-7777-7777-777777777777");
List<Guid> listGuid = new List<Guid> { guid5, guid7 }; List<Guid> listGuid = new List<Guid> { guid5, guid6, guid7 };
List<Guid> listIDDel = new List<Guid>();//需要删除的检查问题描述ID List<Guid> listIDDel = new List<Guid>();//需要删除的检查问题描述ID
@ -4056,6 +4058,14 @@ namespace APT.BS.WebApi.Controllers.Api
Set555.Add(i + 1); 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) else if (item.SAFE_CHECK_QUESTION_ID == guid7)
{ {
listDetail[i].CHECKRESULT = 30; listDetail[i].CHECKRESULT = 30;
@ -4136,7 +4146,7 @@ namespace APT.BS.WebApi.Controllers.Api
// listEmptyAddress.Add(i + 1); // 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) if (listDetailReason == null)
{ {
@ -4238,6 +4248,10 @@ namespace APT.BS.WebApi.Controllers.Api
{ {
Msg += (string.IsNullOrEmpty(Msg) ? "" : ",") + "子项【" + string.Join(",", Set555) + "】问题等级必须为空"; Msg += (string.IsNullOrEmpty(Msg) ? "" : ",") + "子项【" + string.Join(",", Set555) + "】问题等级必须为空";
} }
if (Set666.Count > 0)
{
Msg += (string.IsNullOrEmpty(Msg) ? "" : ",") + "子项【" + string.Join(",", Set666) + "】问题等级必须为空";
}
if (OtherNoRemarkResult.Count > 0) if (OtherNoRemarkResult.Count > 0)
{ {
Msg += (string.IsNullOrEmpty(Msg) ? "请" : ",") + "填写子项【" + string.Join(",", OtherNoRemarkResult) + "】问题描述为【其他】的问题等级和备注"; Msg += (string.IsNullOrEmpty(Msg) ? "请" : ",") + "填写子项【" + string.Join(",", OtherNoRemarkResult) + "】问题描述为【其他】的问题等级和备注";
@ -4267,6 +4281,10 @@ namespace APT.BS.WebApi.Controllers.Api
{ {
Msg += (string.IsNullOrEmpty(Msg) ? "" : ",") + "行【" + string.Join(",", Set555) + "】问题等级必须为空"; Msg += (string.IsNullOrEmpty(Msg) ? "" : ",") + "行【" + string.Join(",", Set555) + "】问题等级必须为空";
} }
if (Set666.Count > 0)
{
Msg += (string.IsNullOrEmpty(Msg) ? "" : ",") + "行【" + string.Join(",", Set666) + "】问题等级必须为空";
}
if (OtherNoRemarkResult.Count > 0) if (OtherNoRemarkResult.Count > 0)
{ {
Msg += (string.IsNullOrEmpty(Msg) ? "请" : ",") + "填写行【" + string.Join(",", OtherNoRemarkResult) + "】问题描述为【其他】的问题等级和备注"; Msg += (string.IsNullOrEmpty(Msg) ? "请" : ",") + "填写行【" + string.Join(",", OtherNoRemarkResult) + "】问题描述为【其他】的问题等级和备注";