ccy/mh_sms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

处理问题

Browse Source
This commit is contained in:
wjn 2024-06-27 10:39:59 +08:00
parent a5f00ca286
commit 6aab331ebd
4 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs
View File

@ -5360,20 +5360,7 @@ namespace APT.BaseData.Services.DomainServices
fileIds.Add(file.IMG_FILE_ID); fileIds.Add(file.IMG_FILE_ID);
} }
DepartmentService.AddDocument("风险管理", "年度风险评价计划审核表", "年度风险评价计划", "附件", "计划文件", DateTime.Now.AddYears(1), entity.ID, fileIds, entity.RELEASE_USER_ID); DepartmentService.AddDocument("风险管理", "年度风险评价计划审核表", "年度风险评价计划", "附件", "计划文件", DateTime.Now.AddYears(1), entity.ID, fileIds, entity.RELEASE_USER_ID);
var teamLeaders = GetEntities<T_PF_APPROVE_TEMP_DETAIL>(t => t.NAME == "风险管理小组组长" || t.NAME == "风险管理小组副组长", new BaseFilter(orgId));
if (teamLeaders != null && teamLeaders.Any())
{
var leader = teamLeaders.Where(t => t.NAME == "风险管理小组组长");
foreach (var leaderuser in leader)
{
leaderuser.DEFAULT_APPROVE_USER_ID = entity.GROUP_LEADER_ID;
}
var deputyLeader = teamLeaders.Where(t => t.NAME == "风险管理小组副组长");
foreach (var leaderuser in deputyLeader)
{
leaderuser.DEFAULT_APPROVE_USER_ID = entity.DEPUTY_GROUP_LEADER_ID;
}
}
if (orgId == Guid.Parse("b043b28b-bbc3-c452-6052-4fba1457abfa"))//行洛坑 if (orgId == Guid.Parse("b043b28b-bbc3-c452-6052-4fba1457abfa"))//行洛坑
{ {
sendUser = (Guid)GetEntity<T_FM_DEPARTMENT>(t => t.NAME == "办公室").USER_ID; sendUser = (Guid)GetEntity<T_FM_DEPARTMENT>(t => t.NAME == "办公室").USER_ID;
@ -5627,7 +5614,6 @@ namespace APT.BaseData.Services.DomainServices
UpdateEntityNoCommit(entity, "STATUS"); UpdateEntityNoCommit(entity, "STATUS");
UpdateEntityNoCommit(model); UpdateEntityNoCommit(model);
BantchAddEntityNoCommit(noticefiles); BantchAddEntityNoCommit(noticefiles);
BantchUpdateEntityNoCommit(teamLeaders);
}); });
return true; return true;

18
APT.MicroApi/APT.HM.WebApi/Controllers/Api/EvaluationPlanController.cs
View File

@ -57,7 +57,7 @@ namespace APT.HM.WebApi.Controllers.Api
T_FM_NOTIFICATION_TASK finishNotice = null; T_FM_NOTIFICATION_TASK finishNotice = null;
List<T_HM_EVALUATION_DETAIL_AREA> areas = new List<T_HM_EVALUATION_DETAIL_AREA>(); List<T_HM_EVALUATION_DETAIL_AREA> areas = new List<T_HM_EVALUATION_DETAIL_AREA>();
List<T_HM_EVALUATION_DETAIL_IDENTIFYING> identifyings = new List<T_HM_EVALUATION_DETAIL_IDENTIFYING>(); List<T_HM_EVALUATION_DETAIL_IDENTIFYING> identifyings = new List<T_HM_EVALUATION_DETAIL_IDENTIFYING>();
IEnumerable<T_PF_APPROVE_TEMP_DETAIL> teamLeaders = new List<T_PF_APPROVE_TEMP_DETAIL>();
if (entity.PUBLISH != null && entity.PUBLISH.Equals("SaveAndNotify")) if (entity.PUBLISH != null && entity.PUBLISH.Equals("SaveAndNotify"))
{ {
if (Nav_Details.Count() == 0) if (Nav_Details.Count() == 0)
@ -100,6 +100,20 @@ namespace APT.HM.WebApi.Controllers.Api
{ {
finishNotice = NotificationTaskService.FOGetTaskFinishModel(entity.TaskID,entity.ID, "HM042_SHOWPRINT"); finishNotice = NotificationTaskService.FOGetTaskFinishModel(entity.TaskID,entity.ID, "HM042_SHOWPRINT");
} }
teamLeaders = GetEntities<T_PF_APPROVE_TEMP_DETAIL>(t => t.NAME == "风险管理小组组长" || t.NAME == "风险管理小组副组长", new BaseFilter(entity.ORG_ID));
if (teamLeaders != null && teamLeaders.Any())
{
var leader = teamLeaders.Where(t => t.NAME == "风险管理小组组长");
foreach (var leaderuser in leader)
{
leaderuser.DEFAULT_APPROVE_USER_ID = entity.GROUP_LEADER_ID;
}
var deputyLeader = teamLeaders.Where(t => t.NAME == "风险管理小组副组长");
foreach (var leaderuser in deputyLeader)
{
leaderuser.DEFAULT_APPROVE_USER_ID = entity.DEPUTY_GROUP_LEADER_ID;
}
}
} }
Nav_Details.ForEach(detail => Nav_Details.ForEach(detail =>
{ {
@ -130,6 +144,8 @@ namespace APT.HM.WebApi.Controllers.Api
AddEntityNoCommit(notice); AddEntityNoCommit(notice);
if (finishNotice != null) if (finishNotice != null)
UpdateEntityNoCommit(finishNotice, "NOTICE_STATUS", "TASK_DT", "MODIFIER_ID"); UpdateEntityNoCommit(finishNotice, "NOTICE_STATUS", "TASK_DT", "MODIFIER_ID");
if (teamLeaders != null)
BantchSaveEntityNoCommit(teamLeaders); //保存子表
}); });
return true; return true;
}); });

1
APT.MicroApi/APT.HM.WebApi/Controllers/Api/HazardTaskController.cs
View File

@ -297,6 +297,7 @@ namespace APT.HM.WebApi.Controllers.Api
} }
allUsers.Add(recordUser); allUsers.Add(recordUser);
} }
allUsers= allUsers.DistinctBy(u => new { u.USER_ID, u.AREA_ID }).ToList();
} }
} }
//添加附件 //添加附件

1
APT.MicroApi/APT.HM.WebApi/Controllers/Api/RiskTaskController.cs
View File

@ -358,6 +358,7 @@ namespace APT.HM.WebApi.Controllers.Api
} }
allUsers.Add(recordUser); allUsers.Add(recordUser);
} }
allUsers = allUsers.DistinctBy(u => new { u.USER_ID, u.AREA_ID }).ToList();
} }
//添加辨识对象 //添加辨识对象