From 62b8ea8da758e0ad8c285a4d857b8a6991ec11d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?= <991152047@qq.com> Date: Wed, 10 Apr 2024 09:19:29 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=A5=A8=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E6=B5=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/CrucialLicenseJobController.cs | 17 ++++++++++------- .../CrucialLicenseJobOutsourceController.cs | 17 ++++++++++------- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs index d78f815..48b2243 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs @@ -968,14 +968,17 @@ namespace APT.FO.WebApi.Controllers } else { - var dep = GetEntity(user.DEPARTMENT_ID.Value); - if (dep != null) + if (user.Nav_Department != null && user.Nav_Department.DEPARTMENT_TYPE == 0) { - if (dep.USER_ID.HasValue) - { approveId = dep.USER_ID.Value; } - else if (dep.CHARGEUSER_ID.HasValue) - { approveId = dep.CHARGEUSER_ID.Value; } - break; + var dep = GetEntity(user.DEPARTMENT_ID.Value); + if (dep != null) + { + if (dep.USER_ID.HasValue) + { approveId = dep.USER_ID.Value; } + else if (dep.CHARGEUSER_ID.HasValue) + { approveId = dep.CHARGEUSER_ID.Value; } + break; + } } } } diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobOutsourceController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobOutsourceController.cs index 0626dc8..f6677f0 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobOutsourceController.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobOutsourceController.cs @@ -456,14 +456,17 @@ namespace APT.FO.WebApi.Controllers } else { - var dep = GetEntity(user.DEPARTMENT_ID.Value); - if (dep != null) + if (user.Nav_Department != null && user.Nav_Department.DEPARTMENT_TYPE == 0) { - if (dep.USER_ID.HasValue) - { approveId = dep.USER_ID.Value; } - else if (dep.CHARGEUSER_ID.HasValue) - { approveId = dep.CHARGEUSER_ID.Value; } - break; + var dep = GetEntity(user.DEPARTMENT_ID.Value); + if (dep != null) + { + if (dep.USER_ID.HasValue) + { approveId = dep.USER_ID.Value; } + else if (dep.CHARGEUSER_ID.HasValue) + { approveId = dep.CHARGEUSER_ID.Value; } + break; + } } } } From f96bcb7333afda159a7e2c7ec121876312899e0d Mon Sep 17 00:00:00 2001 From: wjn Date: Wed, 10 Apr 2024 09:29:11 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=A4=84=E7=90=86=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E8=A2=AB=E5=88=A0=E9=99=A4=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../APT.HM.WebApi/Controllers/Api/NoticeReleaseController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/APT.MicroApi/APT.HM.WebApi/Controllers/Api/NoticeReleaseController.cs b/APT.MicroApi/APT.HM.WebApi/Controllers/Api/NoticeReleaseController.cs index 0315d28..e74b940 100644 --- a/APT.MicroApi/APT.HM.WebApi/Controllers/Api/NoticeReleaseController.cs +++ b/APT.MicroApi/APT.HM.WebApi/Controllers/Api/NoticeReleaseController.cs @@ -144,7 +144,7 @@ namespace APT.HM.WebApi.Controllers.Api listRiskArea.Add(area); foreach (var level in levels) { - var sendUsers = GetEntities(t => t.AREA_ID == Area.AREA_ID && t.DEPARTMENT_LIABLE_ID != null && t.LEVEL == (FMDepartmentType)int.Parse(level), new BaseFilter(entity.ORG_ID)).Select(t => new { t.DEPARTMENT_LIABLE_ID }).Distinct(); + var sendUsers = GetEntities(t => t.AREA_ID == Area.AREA_ID &&t.Nav_DepartmentLiable.IS_DELETED==false && t.DEPARTMENT_LIABLE_ID != null && t.LEVEL == (FMDepartmentType)int.Parse(level), new BaseFilter(entity.ORG_ID)).Select(t => new { t.DEPARTMENT_LIABLE_ID }).Distinct(); if (sendUsers.Any()) { T_HM_RISK_TASK_DETAIL taskDetail = new T_HM_RISK_TASK_DETAIL(); From c2aa7deb79cbdfffdace67983460cc12475bef61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?= <991152047@qq.com> Date: Wed, 10 Apr 2024 10:20:49 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=A5=A8=E5=A4=96?= =?UTF-8?q?=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CrucialLicenseJobOutsourceController.cs | 29 +++++++++++++------ 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobOutsourceController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobOutsourceController.cs index f6677f0..1ff4dbe 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobOutsourceController.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobOutsourceController.cs @@ -320,21 +320,32 @@ namespace APT.FO.WebApi.Controllers if (appdetails != null && appdetails.Any())//curentApprove == null { var sendUserIds = new List(); - //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.APPROVE_USER_ID == applyUserId); + if (curentApprove != null) + { + var removeApprove = appdetails.Where(i => i.NUM < curentApprove.NUM && i.NODE_APPROVE_STATUS == (int)NodeApproveStatus.Doing); + if (removeApprove != null && removeApprove.Any()) + { + foreach (var item in removeApprove) + { + appdetails.Remove(item); + } + } + } 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()) { appdetails.Where(i => i.NUM == appdetails.Min(x => x.NUM) && i.APPROVE_USER_ID != applyUserId && i.NODE_APPROVE_STATUS == (int)NodeApproveStatus.Doing).ForEach(i => i.IS_CURRENT = true); sendUserIds = appdetails.Where(i => i.NUM == appdetails.Min(x => x.NUM) && i.APPROVE_USER_ID != applyUserId).Select(t => (Guid)t.APPROVE_USER_ID).ToList(); } - else - { - var appdetailsAll = appdetails; - var removeTemps = appdetailsAll.FirstOrDefault(i => i.NUM == appdetails.Min(x => x.NUM) && i.APPROVE_USER_ID == applyUserId); - appdetailsAll.Remove(removeTemps); - appdetails.Where(i => i.NUM == appdetailsAll.Min(x => x.NUM) && i.NODE_APPROVE_STATUS == (int)NodeApproveStatus.Doing).ForEach(i => i.IS_CURRENT = true); - sendUserIds = appdetails.Where(i => i.NUM == appdetailsAll.Min(x => x.NUM) && i.NODE_APPROVE_STATUS == (int)NodeApproveStatus.Doing).Select(t => (Guid)t.APPROVE_USER_ID).ToList(); - } + //else + //{ + // var appdetailsAll = appdetails; + // var removeTemps = appdetailsAll.FirstOrDefault(i => i.NUM == appdetails.Min(x => x.NUM) && i.APPROVE_USER_ID == applyUserId); + // appdetailsAll.Remove(removeTemps); + // appdetails.Where(i => i.NUM == appdetailsAll.Min(x => x.NUM) && i.NODE_APPROVE_STATUS == (int)NodeApproveStatus.Doing).ForEach(i => i.IS_CURRENT = true); + // sendUserIds = appdetails.Where(i => i.NUM == appdetailsAll.Min(x => x.NUM) && i.NODE_APPROVE_STATUS == (int)NodeApproveStatus.Doing).Select(t => (Guid)t.APPROVE_USER_ID).ToList(); + //} if (sendUserIds != null && sendUserIds.Any()) { var sendUserNames = new List(); From 884bf7ff9717b64add6a13857533f468560a14d8 Mon Sep 17 00:00:00 2001 From: wjn Date: Wed, 10 Apr 2024 11:37:35 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/PreShiftMeetingRecordController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/PreShiftMeetingRecordController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/PreShiftMeetingRecordController.cs index 97af734..2f793e4 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/PreShiftMeetingRecordController.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/PreShiftMeetingRecordController.cs @@ -116,7 +116,7 @@ namespace APT.FO.WebApi.Controllers.Api.FO { var meetingTime = DateTime.Now; //meetingTime = DateTime.Parse("2023-06-15 06:30:00"); - if (entity.START_TIME.AddMinutes(-15) >= meetingTime) + if (entity.START_TIME!= DateTime.MinValue && entity.START_TIME.AddMinutes(-15) >= meetingTime) { throw new Exception("班前会议需等到" + entity.START_TIME.AddMinutes(-15) + "后提交!"); } From 40c80d36225d82cd264deac89b5617ac3de273e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?= <991152047@qq.com> Date: Wed, 10 Apr 2024 11:46:54 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs | 1 + .../Controllers/CrucialLicenseJobOutsourceController.cs | 1 + .../Controllers/Api/CrucialTaskAnalysisController.cs | 1 + .../APT.HM.WebApi/Controllers/Api/JobtaskIdentifyController.cs | 1 + .../APT.HM.WebApi/Controllers/Api/LicenseAnalysisController.cs | 1 + .../Controllers/Api/OperationTaskDistinguishAnalyzeController.cs | 1 + .../Controllers/Api/OrdinaryTaskAnalysisController.cs | 1 + 7 files changed, 7 insertions(+) diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs index 48b2243..e12737e 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs @@ -1543,6 +1543,7 @@ namespace APT.FO.WebApi.Controllers var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID; var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; var loginUserCode = APT.Infrastructure.Api.AppContext.CurrentSession.UserCode; + pageFilter.IgnoreDataRule = true; //安环部负责人departmentID var manageDepartId = this.GetEntity(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME == "安环部负责人" && t.ENABLE_STATUS == 0)?.DEPARTMENT_ID; if (loginUserCode == "admin" || loginDepartmentId == manageDepartId) diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobOutsourceController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobOutsourceController.cs index 1ff4dbe..a294d06 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobOutsourceController.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobOutsourceController.cs @@ -637,6 +637,7 @@ namespace APT.FO.WebApi.Controllers var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID; var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; var loginUserCode = APT.Infrastructure.Api.AppContext.CurrentSession.UserCode; + pageFilter.IgnoreDataRule = true; //安环部负责人departmentID var manageDepartId = this.GetEntity(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME == "安环部负责人" && t.ENABLE_STATUS == 0)?.DEPARTMENT_ID; if (loginUserCode == "admin" || loginDepartmentId == manageDepartId) diff --git a/APT.MicroApi/APT.HM.WebApi/Controllers/Api/CrucialTaskAnalysisController.cs b/APT.MicroApi/APT.HM.WebApi/Controllers/Api/CrucialTaskAnalysisController.cs index 864c1df..8c50d41 100644 --- a/APT.MicroApi/APT.HM.WebApi/Controllers/Api/CrucialTaskAnalysisController.cs +++ b/APT.MicroApi/APT.HM.WebApi/Controllers/Api/CrucialTaskAnalysisController.cs @@ -535,6 +535,7 @@ namespace APT.HM.WebApi.Controllers.Api var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID; var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; var loginUserCode = APT.Infrastructure.Api.AppContext.CurrentSession.UserCode; + pageFilter.IgnoreDataRule = true; //安环部负责人departmentID var manageDepartId = this.GetEntity(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME == "安环部负责人" && t.ENABLE_STATUS == 0)?.DEPARTMENT_ID; if (loginUserCode == "admin" || loginDepartmentId == manageDepartId) diff --git a/APT.MicroApi/APT.HM.WebApi/Controllers/Api/JobtaskIdentifyController.cs b/APT.MicroApi/APT.HM.WebApi/Controllers/Api/JobtaskIdentifyController.cs index 1d67f28..1d3fdc0 100644 --- a/APT.MicroApi/APT.HM.WebApi/Controllers/Api/JobtaskIdentifyController.cs +++ b/APT.MicroApi/APT.HM.WebApi/Controllers/Api/JobtaskIdentifyController.cs @@ -830,6 +830,7 @@ namespace APT.HM.WebApi.Controllers.Api var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID; var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; var loginUserCode = APT.Infrastructure.Api.AppContext.CurrentSession.UserCode; + pageFilter.IgnoreDataRule = true; //安环部负责人departmentID var manageDepartId = this.GetEntity(t=>t.Nav_ApproveRole!=null && t.Nav_ApproveRole.NAME == "安环部负责人" && t.ENABLE_STATUS == 0)?.DEPARTMENT_ID; if (loginUserCode == "admin" || loginDepartmentId == manageDepartId) diff --git a/APT.MicroApi/APT.HM.WebApi/Controllers/Api/LicenseAnalysisController.cs b/APT.MicroApi/APT.HM.WebApi/Controllers/Api/LicenseAnalysisController.cs index 956190c..4f23856 100644 --- a/APT.MicroApi/APT.HM.WebApi/Controllers/Api/LicenseAnalysisController.cs +++ b/APT.MicroApi/APT.HM.WebApi/Controllers/Api/LicenseAnalysisController.cs @@ -663,6 +663,7 @@ namespace APT.HM.WebApi.Controllers.Api var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID; var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; var loginUserCode = APT.Infrastructure.Api.AppContext.CurrentSession.UserCode; + pageFilter.IgnoreDataRule = true; //安环部负责人departmentID var manageDepartId = this.GetEntity(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME == "安环部负责人" && t.ENABLE_STATUS == 0)?.DEPARTMENT_ID; if (loginUserCode == "admin" || loginDepartmentId == manageDepartId) diff --git a/APT.MicroApi/APT.HM.WebApi/Controllers/Api/OperationTaskDistinguishAnalyzeController.cs b/APT.MicroApi/APT.HM.WebApi/Controllers/Api/OperationTaskDistinguishAnalyzeController.cs index 6b14696..32dd22c 100644 --- a/APT.MicroApi/APT.HM.WebApi/Controllers/Api/OperationTaskDistinguishAnalyzeController.cs +++ b/APT.MicroApi/APT.HM.WebApi/Controllers/Api/OperationTaskDistinguishAnalyzeController.cs @@ -903,6 +903,7 @@ namespace APT.HM.WebApi.Controllers.Api var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID; var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; var loginUserCode = APT.Infrastructure.Api.AppContext.CurrentSession.UserCode; + pageFilter.IgnoreDataRule = true; //安环部负责人departmentID var manageDepartId = this.GetEntity(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME == "安环部负责人" && t.ENABLE_STATUS == 0)?.DEPARTMENT_ID; if (loginUserCode == "admin" || loginDepartmentId == manageDepartId) diff --git a/APT.MicroApi/APT.HM.WebApi/Controllers/Api/OrdinaryTaskAnalysisController.cs b/APT.MicroApi/APT.HM.WebApi/Controllers/Api/OrdinaryTaskAnalysisController.cs index 6bdec6b..0ca0b67 100644 --- a/APT.MicroApi/APT.HM.WebApi/Controllers/Api/OrdinaryTaskAnalysisController.cs +++ b/APT.MicroApi/APT.HM.WebApi/Controllers/Api/OrdinaryTaskAnalysisController.cs @@ -660,6 +660,7 @@ namespace APT.HM.WebApi.Controllers.Api var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID; var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; var loginUserCode = APT.Infrastructure.Api.AppContext.CurrentSession.UserCode; + pageFilter.IgnoreDataRule = true; //安环部负责人departmentID var manageDepartId = this.GetEntity(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME == "安环部负责人" && t.ENABLE_STATUS == 0)?.DEPARTMENT_ID; if (loginUserCode == "admin" || loginDepartmentId == manageDepartId)