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-12-17 11:42:36 +08:00
parent dcf4793c9c
commit bd778dbefb
2 changed files with 62 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs
View File

@ -851,7 +851,37 @@ namespace APT.FO.WebApi.Controllers
var zbRoles = roles.FirstOrDefault(t => t.NAME.Contains("值班"));
var sdRoles = roles.Where(t => t.NAME.Contains("属地")).ToList();
var roleIds = sdRoles.Select(t => t.ID).ToList();
if (zbRoles != null && approveTempDetail.APPROVE_ROLE_ID == zbRoles.ID)
var approveRole = this.GetEntity<T_PF_APPROVAL_ROLE>(t => t.ID == approveTempDetail.APPROVE_ROLE_ID);
if (approveRole != null && approveRole.NAME == "分管领导")
{
var user = users.FirstOrDefault(t => t.ID == loginUserId);
if (user.DEPARTMENT_ID != null)
{
List<Guid> departmentIds = new List<Guid>();
GetDepartmentId((Guid)user.DEPARTMENT_ID, ref departmentIds);
if (departmentIds.Any())
{
var dep = GetEntity<T_FM_DEPARTMENT>(t => departmentIds.Contains(t.ID) && t.DEPARTMENT_TYPE == approveRole.DEPARTMENT_TYPE);
if (dep != null && dep.CHARGEUSER_ID != null)
{
approveId = dep.CHARGEUSER_ID;
}
else
{
return approveId;
}
}
else
{
return approveId;
}
}
else
{
return approveId;
}
}
else if (zbRoles != null && approveTempDetail.APPROVE_ROLE_ID == zbRoles.ID)
{
var job = this.GetEntity<T_FO_SCHEDULING>(t=>t.DATE.Date == DateTime.Now.Date);
if (job != null)

32
APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobOutsourceController.cs
View File

@ -576,7 +576,37 @@ namespace APT.FO.WebApi.Controllers
var zbRoles = roles.FirstOrDefault(t => t.NAME.Contains("值班"));
var sdRoles = roles.Where(t => t.NAME.Contains("属地")).ToList();
var roleIds = sdRoles.Select(t => t.ID).ToList();
if (zbRoles != null && approveTempDetail.APPROVE_ROLE_ID == zbRoles.ID)
var approveRole = this.GetEntity<T_PF_APPROVAL_ROLE>(t => t.ID == approveTempDetail.APPROVE_ROLE_ID);
if (approveRole != null && approveRole.NAME == "分管领导")
{
var user = users.FirstOrDefault(t => t.ID == loginUserId);
if (user.DEPARTMENT_ID != null)
{
List<Guid> departmentIds = new List<Guid>();
GetDepartmentId((Guid)user.DEPARTMENT_ID, ref departmentIds);
if (departmentIds.Any())
{
var dep = GetEntity<T_FM_DEPARTMENT>(t => departmentIds.Contains(t.ID) && t.DEPARTMENT_TYPE == approveRole.DEPARTMENT_TYPE);
if (dep != null && dep.CHARGEUSER_ID != null)
{
approveId = dep.CHARGEUSER_ID;
}
else
{
return approveId;
}
}
else
{
return approveId;
}
}
else
{
return approveId;
}
}
else if (zbRoles != null && approveTempDetail.APPROVE_ROLE_ID == zbRoles.ID)
{
var job = this.GetEntity<T_FO_SCHEDULING>(t => t.DATE.Date == DateTime.Now.Date);
if (job != null)