diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs index b6fc23b..dac3f98 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs @@ -1427,6 +1427,26 @@ namespace APT.FO.WebApi.Controllers { var sendUserIds = new List(); //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(); if (detailTemps != null && detailTemps.Any()) { diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobOutsourceController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobOutsourceController.cs index 29fd3f9..17fced3 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobOutsourceController.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobOutsourceController.cs @@ -371,6 +371,26 @@ namespace APT.FO.WebApi.Controllers //所有节点均无审核人,直接归档 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(); var curentApprove = appdetails.FirstOrDefault(i => i.APPROVE_USER_ID == applyUserId); if (curentApprove != null)