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

找人调整

Browse Source
This commit is contained in:
何美荣 2025-11-28 20:31:12 +08:00
parent 84f0e53995
commit 34f117960c
1 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11499,13 +11499,17 @@ namespace APT.BaseData.Services.DomainServices
foreach (var detail in reportDetails)
{
var departId = users.FirstOrDefault(t => t.ID == detail.RECITIFY_USER_ID).DEPARTMENT_ID;
var departUserId = departs.FirstOrDefault(t => t.ID == departId)?.USER_ID;
var departFirst = departs.FirstOrDefault(t => t.ID == departId);
if (detail.RECITIFY_USER_ID == entity.APPLY_USER_ID)
{
var acceptUser = users.FirstOrDefault(t => t.DEPARTMENT_ID == departId && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安全员"));
if (acceptUser == null || (acceptUser != null && acceptUser.ID == detail.RECITIFY_USER_ID))
{
acceptUser = users.FirstOrDefault(t => t.DEPARTMENT_ID == departId && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("负责人"));
}
if (acceptUser == null)
{
acceptUser = users.FirstOrDefault(t => t.ID == departFirst?.USER_ID);
}
var user = users.FirstOrDefault(t => t.ID == entity.APPLY_USER_ID);
detail.ISCHECK = true;
@ -11579,12 +11583,12 @@ namespace APT.BaseData.Services.DomainServices
detail.Nav_ReportDetailBasics = null;
//reportDetails.Add(detail);
}
else if (departUserId != null && detail.RECITIFY_USER_ID != departUserId)
else if (departFirst != null && departFirst.DEPARTMENT_TYPE == (int)FMDepartmentType.Class)
{
var acceptUser = users.FirstOrDefault(t => t.DEPARTMENT_ID == departId && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安全员"));
if (acceptUser == null || (acceptUser != null && acceptUser.ID == detail.RECITIFY_USER_ID))
var acceptUser = users.FirstOrDefault(t => t.DEPARTMENT_ID == departId && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("负责人"));
if (acceptUser == null)
{
acceptUser = users.FirstOrDefault(t => t.DEPARTMENT_ID == departId && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("负责人"));
acceptUser = users.FirstOrDefault(t => t.ID == departFirst?.USER_ID);
}
var user = users.FirstOrDefault(t => t.ID == detail.RECITIFY_USER_ID);
detail.ISCHECK = true;
@ -11737,6 +11741,10 @@ namespace APT.BaseData.Services.DomainServices
if (user == null)
{
user = users.FirstOrDefault(t => t.DEPARTMENT_ID == departId && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("负责人"));
}
if (user == null)
{
user = users.FirstOrDefault(t => t.ID == departFirst?.USER_ID);
}
if (user != null)
{
@ -11928,7 +11936,7 @@ namespace APT.BaseData.Services.DomainServices
if (entity != null && entity.RECITIFY_USER_ID != null)
{
var departId = users.FirstOrDefault(t => t.ID == entity.RECITIFY_USER_ID).DEPARTMENT_ID;
var departUserId = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == departId)?.USER_ID;
var departFist = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == departId);
if (entity.RECITIFY_USER_ID == entity.APPLY_USER_ID)
{
var acceptUser = users.FirstOrDefault(t => t.DEPARTMENT_ID == departId && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安全员"));
@ -11936,6 +11944,10 @@ namespace APT.BaseData.Services.DomainServices
{
acceptUser = users.FirstOrDefault(t => t.DEPARTMENT_ID == departId && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("负责人"));
}
if (acceptUser == null)
{
acceptUser = users.FirstOrDefault(t => t.ID == departFist?.USER_ID);
}
var user = users.FirstOrDefault(t => t.ID == entity.APPLY_USER_ID);
record = new T_SK_HIDDEN_DANGER_RECTIFY_RECORD();
record.APPLY_DEPARTMENT_ID = entity.APPLY_DEPARTMENT_ID;
@ -11991,15 +12003,15 @@ namespace APT.BaseData.Services.DomainServices
endtime, (int)FMNoticeTypeEnum.消息, "SK022");
sendNotices.Add(sendNotice);
}
else if (departUserId != null && entity.RECITIFY_USER_ID != departUserId)
else if (departFist != null && departFist.DEPARTMENT_TYPE == (int)FMDepartmentType.Class)
{
var user = users.FirstOrDefault(t => t.ID == entity.RECITIFY_USER_ID);
if (user != null)
{
var acceptUser = users.FirstOrDefault(t => t.DEPARTMENT_ID == departId && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安全员"));
if (acceptUser == null || (acceptUser != null && acceptUser.ID == entity.RECITIFY_USER_ID))
var acceptUser = users.FirstOrDefault(t => t.DEPARTMENT_ID == departId && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("负责人"));
if (acceptUser == null)
{
acceptUser = users.FirstOrDefault(t => t.DEPARTMENT_ID == departId && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("负责人"));
acceptUser = users.FirstOrDefault(t => t.ID == departFist?.USER_ID);
}
record = new T_SK_HIDDEN_DANGER_RECTIFY_RECORD();
record.APPLY_DEPARTMENT_ID = entity.APPLY_DEPARTMENT_ID;
@ -12125,6 +12137,10 @@ namespace APT.BaseData.Services.DomainServices
{
user = users.FirstOrDefault(t => t.DEPARTMENT_ID == departId && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("负责人"));
}
if (user == null)
{
user = users.FirstOrDefault(t => t.ID == departFist?.USER_ID);
}
if (user != null)
{
var sendNotice = NotificationTaskService.InsertUserNoticeTaskModel("隐患整改通知表", notice.ID, notice.ORG_ID, user.ID, user.NAME, DateTime.Now,