From 04d7a3a015c45eeb60e314417a8c2e1bfeec16eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?= <10755671+mei-rong-he@user.noreply.gitee.com> Date: Tue, 26 May 2026 14:04:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=A5=A8=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=EF=BC=8C=E4=BA=A4=E6=8E=A5=E7=8F=AD=E8=99=9A=E6=8B=9F=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ChangeShiftRecordController.cs | 6 +++--- .../CrucialLicenseJobController.cs | 21 ++++++++++++++++--- .../CrucialLicenseJobOutsourceController.cs | 19 +++++++++++++++-- 3 files changed, 38 insertions(+), 8 deletions(-) diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/ChangeShiftRecordController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/ChangeShiftRecordController.cs index f963571..3d2e2e0 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/ChangeShiftRecordController.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/ChangeShiftRecordController.cs @@ -326,15 +326,15 @@ namespace APT.FO.WebApi.Controllers.Api.FO } if (!string.IsNullOrEmpty(curUser)) { - result.Data = result.Data.Where(t=>t.CURRENT_USER.Contains(curUser)).ToList(); + result.Data = result.Data.Where(t=> t.CURRENT_USER!=null && t.CURRENT_USER.Contains(curUser)).ToList(); } if (!string.IsNullOrEmpty(changeDept)) { - result.Data = result.Data.Where(t => t.CHANGE_DEPART.Contains(changeDept)).ToList(); + result.Data = result.Data.Where(t => t.CHANGE_DEPART!=null && t.CHANGE_DEPART.Contains(changeDept)).ToList(); } if (!string.IsNullOrEmpty(changeUser)) { - result.Data = result.Data.Where(t => t.CHANGE_USER.Contains(changeUser)).ToList(); + result.Data = result.Data.Where(t => t.CHANGE_USER!=null && t.CHANGE_USER.Contains(changeUser)).ToList(); } result.TotalCount = result.Data.Count(); } diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs index dac3f98..35cf3d1 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs @@ -1349,7 +1349,8 @@ namespace APT.FO.WebApi.Controllers //上个消息 T_FM_NOTIFICATION_TASK finishNotice = null; //细表 - List appdetails = new List(); + List appdetails = new List(); + List appdetailAutos = new List(); Expression> express = t => t.FORM_CODE == "FO017" && t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用; if (!string.IsNullOrEmpty(param)) express = express.And(t => t.PARAM == param); @@ -1428,7 +1429,7 @@ 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(); + var applyApprove = appdetails.Where(i => i.NUM == appdetails.Min(x => x.NUM) && i.APPROVE_USER_ID == applyUserId && i.NODE_APPROVE_STATUS == (int)NodeApproveStatus.Done).ToList(); if (applyApprove != null && applyApprove.Any()) { //本人默认审批，存入一条已办 @@ -1446,6 +1447,18 @@ namespace APT.FO.WebApi.Controllers curentTask.USER_NAME = users.FirstOrDefault(t => t.ID == applyUserId)?.NAME; curentTask.SOURCE_FORMCODE = approve.APPROVE_CODE; notices.Add(curentTask); + T_PF_APPROVE_DETAIL detail = new T_PF_APPROVE_DETAIL(); + detail.APPROVE_ID = approve.ID; + detail.IS_CURRENT = false; + detail.ORG_ID = approveTemp.ORG_ID; + detail.NAME = applyApprove.FirstOrDefault()?.NAME; + detail.NUM = applyApprove.FirstOrDefault() != null ? applyApprove.FirstOrDefault().NUM:0; + detail.APPROVE_ROLE_ID = applyApprove.FirstOrDefault()?.APPROVE_ROLE_ID; + detail.IS_ALLOW_UPDATE = applyApprove.FirstOrDefault() != null? applyApprove.FirstOrDefault().IS_ALLOW_UPDATE:false; + detail.APPROVE_USER_ID = applyApprove.FirstOrDefault()?.APPROVE_USER_ID; + detail.NODE_APPROVE_STATUS = (int)NodeApproveStatus.Done; + detail.NODE_APPROVE_TIME = DateTime.Now; + appdetailAutos.Add(detail); } 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()) @@ -1666,7 +1679,9 @@ namespace APT.FO.WebApi.Controllers if (approve != null) AddEntityNoCommit(approve); if (appdetails != null && appdetails.Any()) - BantchAddEntityNoCommit(appdetails); + BantchAddEntityNoCommit(appdetails); + if (appdetailAutos != null && appdetailAutos.Any()) + BantchAddEntityNoCommit(appdetailAutos); if (finishNotice != null) UpdateEntityNoCommit(finishNotice); if (notices != null && notices.Any()) diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobOutsourceController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobOutsourceController.cs index 17fced3..b18feb4 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobOutsourceController.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobOutsourceController.cs @@ -294,7 +294,8 @@ namespace APT.FO.WebApi.Controllers //上个消息 T_FM_NOTIFICATION_TASK finishNotice = null; //细表 - List appdetails = new List(); + List appdetails = new List(); + List appdetailAutos = new List(); Expression> express = t => t.FORM_CODE == "FO025" && t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用; if (!string.IsNullOrEmpty(param)) express = express.And(t => t.PARAM == param); @@ -389,7 +390,19 @@ namespace APT.FO.WebApi.Controllers curentTask.USER_ID = (Guid)applyUserId; curentTask.USER_NAME = users.FirstOrDefault(t => t.ID == applyUserId)?.NAME; curentTask.SOURCE_FORMCODE = approve.APPROVE_CODE; - notices.Add(curentTask); + notices.Add(curentTask); + T_PF_APPROVE_DETAIL detail = new T_PF_APPROVE_DETAIL(); + detail.APPROVE_ID = approve.ID; + detail.IS_CURRENT = false; + detail.ORG_ID = approveTemp.ORG_ID; + detail.NAME = applyApprove.FirstOrDefault()?.NAME; + detail.NUM = applyApprove.FirstOrDefault() != null ? applyApprove.FirstOrDefault().NUM : 0; + detail.APPROVE_ROLE_ID = applyApprove.FirstOrDefault()?.APPROVE_ROLE_ID; + detail.IS_ALLOW_UPDATE = applyApprove.FirstOrDefault() != null ? applyApprove.FirstOrDefault().IS_ALLOW_UPDATE : false; + detail.APPROVE_USER_ID = applyApprove.FirstOrDefault()?.APPROVE_USER_ID; + detail.NODE_APPROVE_STATUS = (int)NodeApproveStatus.Done; + detail.NODE_APPROVE_TIME = DateTime.Now; + appdetailAutos.Add(detail); } var sendUserIds = new List(); var curentApprove = appdetails.FirstOrDefault(i => i.APPROVE_USER_ID == applyUserId); @@ -574,6 +587,8 @@ namespace APT.FO.WebApi.Controllers AddEntityNoCommit(approve); if (appdetails != null && appdetails.Any()) BantchAddEntityNoCommit(appdetails); + if (appdetailAutos != null && appdetailAutos.Any()) + BantchAddEntityNoCommit(appdetailAutos); if (finishNotice != null) UpdateEntityNoCommit(finishNotice); if (notices != null && notices.Any())