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:
何美荣 2026-05-25 18:35:09 +08:00
parent 010d6f2246
commit d9448e7976
2 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1427,6 +1427,26 @@ namespace APT.FO.WebApi.Controllers
{ {
var sendUserIds = new List<Guid>(); var sendUserIds = new List<Guid>();
//var curentApprove = appdetails.FirstOrDefault(i => i.NUM == appdetails.Min(x => x.NUM) && i.NODE_APPROVE_STATUS == (int)NodeApproveStatus.Doing); //var curentApprove = appdetails.FirstOrDefault(i => i.NUM == appdetails.Min(x => x.NUM) && i.NODE_APPROVE_STATUS == (int)NodeApproveStatus.Doing);
//如果第一个批的人刚好是自己，加一条已办的审批记录
var applyApprove = appdetails.Where(i => i.NUM == appdetails.Min(x => x.NUM) && i.APPROVE_USER_ID == applyUserId && i.NODE_APPROVE_STATUS == (int)NodeApproveStatus.Doing).ToList();
if (applyApprove != null && applyApprove.Any())
{
//本人默认审批，存入一条已办
T_FM_NOTIFICATION_TASK curentTask = new T_FM_NOTIFICATION_TASK();
curentTask.CODE = DateTime.Now.ToString("yyyyMMddHHmmss");
curentTask.NOTICE_TITLE = approve.NAME + "-" + operationStep?.NAME + "审批";
curentTask.SOURCE_DATA_ID = approve.ID;
curentTask.ORG_ID = approve.ORG_ID;
curentTask.ID = Guid.NewGuid();
curentTask.TASK_STARTDT = DateTime.Now;
curentTask.TASK_ENDDT = DateTime.Now.AddHours(24);
curentTask.NOTICE_TYPE = (int)FMNoticeTypeEnum.消息;
curentTask.NOTICE_STATUS = (int)FMNoticeStatusEnum.正常已办;
curentTask.USER_ID = (Guid)applyUserId;
curentTask.USER_NAME = users.FirstOrDefault(t => t.ID == applyUserId)?.NAME;
curentTask.SOURCE_FORMCODE = approve.APPROVE_CODE;
notices.Add(curentTask);
}
var detailTemps = appdetails.Where(i => i.NUM == appdetails.Min(x => x.NUM) && i.APPROVE_USER_ID != applyUserId && i.NODE_APPROVE_STATUS == (int)NodeApproveStatus.Doing).ToList(); var detailTemps = appdetails.Where(i => i.NUM == appdetails.Min(x => x.NUM) && i.APPROVE_USER_ID != applyUserId && i.NODE_APPROVE_STATUS == (int)NodeApproveStatus.Doing).ToList();
if (detailTemps != null && detailTemps.Any()) if (detailTemps != null && detailTemps.Any())
{ {

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

@ -371,6 +371,26 @@ namespace APT.FO.WebApi.Controllers
//所有节点均无审核人,直接归档 //所有节点均无审核人,直接归档
if (appdetails != null && appdetails.Any())//curentApprove == null if (appdetails != null && appdetails.Any())//curentApprove == null
{ {
// 如果第一个批的人刚好是自己，加一条已办的审批记录
var applyApprove = appdetails.Where(i => i.NUM == appdetails.Min(x => x.NUM) && i.APPROVE_USER_ID == applyUserId && i.NODE_APPROVE_STATUS == (int)NodeApproveStatus.Doing).ToList();
if (applyApprove != null && applyApprove.Any())
{
//本人默认审批，存入一条已办
T_FM_NOTIFICATION_TASK curentTask = new T_FM_NOTIFICATION_TASK();
curentTask.CODE = DateTime.Now.ToString("yyyyMMddHHmmss");
curentTask.NOTICE_TITLE = approve.NAME + "-" + operationStep?.NAME + "审批";
curentTask.SOURCE_DATA_ID = approve.ID;
curentTask.ORG_ID = approve.ORG_ID;
curentTask.ID = Guid.NewGuid();
curentTask.TASK_STARTDT = DateTime.Now;
curentTask.TASK_ENDDT = DateTime.Now.AddHours(24);
curentTask.NOTICE_TYPE = (int)FMNoticeTypeEnum.消息;
curentTask.NOTICE_STATUS = (int)FMNoticeStatusEnum.正常已办;
curentTask.USER_ID = (Guid)applyUserId;
curentTask.USER_NAME = users.FirstOrDefault(t => t.ID == applyUserId)?.NAME;
curentTask.SOURCE_FORMCODE = approve.APPROVE_CODE;
notices.Add(curentTask);
}
var sendUserIds = new List<Guid>(); var sendUserIds = new List<Guid>();
var curentApprove = appdetails.FirstOrDefault(i => i.APPROVE_USER_ID == applyUserId); var curentApprove = appdetails.FirstOrDefault(i => i.APPROVE_USER_ID == applyUserId);
if (curentApprove != null) if (curentApprove != null)