From 31941c5f64f8af92a3738af600061ba803767b10 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, 9 Jun 2026 14:41:06 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A3=8E=E9=99=A9=E8=BE=A8=E8=AF=86=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/PF/PFApproveCallBackService.cs | 14 ++-- .../Controllers/Api/SKController.cs | 65 ++++++++++++++++++- .../Api/EnterpriseLibraryController.cs | 1 + .../Api/RiskEvaluationController.cs | 5 +- .../Api/RiskEvaluationSummaryController.cs | 10 ++- 5 files changed, 84 insertions(+), 11 deletions(-) diff --git a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs index f578f43..2b4d965 100644 --- a/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs +++ b/APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs @@ -14792,12 +14792,16 @@ namespace APT.BaseData.Services.DomainServices var approveTemp = this.GetEntity(t => t.FORM_CODE == "SK041" && t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用 && t.PARAM == param, "Nav_ApproveTempDetails.Nav_ApproveRole"); if (approveTemp != null && approveTemp.Nav_ApproveTempDetails != null && approveTemp.Nav_ApproveTempDetails.Any()) { - var approveDetailLast = approveTemp.Nav_ApproveTempDetails.OrderByDescending(t => t.NUM).FirstOrDefault(); - var loginUser = users.FirstOrDefault(t => t.ID == APT.Infrastructure.Api.AppContext.CurrentSession.UserID.Value); - if (approveDetailLast.APPROVE_ROLE_ID == loginUser.APPROVE_ROLE_ID) + var approveDetailFirst = approveTemp.Nav_ApproveTempDetails.OrderBy(t => t.NUM).FirstOrDefault(); + var loginUser = users.FirstOrDefault(t => t.ID == APT.Infrastructure.Api.AppContext.CurrentSession.UserID.Value); + if (approveDetailFirst.APPROVE_ROLE_ID == loginUser.APPROVE_ROLE_ID) + { + approveTemp.Nav_ApproveTempDetails.Remove(approveDetailFirst); + } + if(approveTemp.Nav_ApproveTempDetails.Count() == 0) { result.STATUS = PFStandardStatus.Archived; - var resultDetailTemps = resultDetails.Where(t => t.MARK != SKMarkEnum.Auto).ToList(); + var resultDetailTemps = resultDetails.Where(t => (t.MARK != SKMarkEnum.Auto && t.ENABLE_STATUS == SKEnableStatusEnum.Yes) || (t.MARK == SKMarkEnum.Auto && t.ENABLE_STATUS == SKEnableStatusEnum.No)).ToList(); if (user != null && resultDetailTemps != null && resultDetailTemps.Any()) { var productionIds = resultDetailTemps.Where(t => t.PRODUCTION_UNIT_ID != null).Select(m=>m.PRODUCTION_UNIT_ID).Distinct().ToList(); @@ -15139,7 +15143,7 @@ namespace APT.BaseData.Services.DomainServices List douContentPosts = new List(); //List douContentDepartPosts = new List(); List douContentHiddenss = new List(); - var entityDetails = sumDetails.Where(t => t.MARK != SKMarkEnum.Auto).ToList(); + var entityDetails = sumDetails.Where(t => (t.MARK != SKMarkEnum.Auto && t.ENABLE_STATUS == SKEnableStatusEnum.Yes) || (t.MARK == SKMarkEnum.Auto && t.ENABLE_STATUS == SKEnableStatusEnum.No)).ToList(); if (entity.APPLY_USER_ID != null && entityDetails != null && entityDetails.Any()) { var sumDetailIds = entityDetails.Select(t => t.ID).ToList(); diff --git a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs index 7e5db2b..26668ce 100644 --- a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs +++ b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs @@ -1141,7 +1141,7 @@ namespace APT.PP.WebApi.Controllers.Api plan.APPLY_DEPARTMENT_ID = userInfo.DEPARTMENT_ID; plan.APPLY_USER_ID = userInfo.ID; plan.YEAR = DateTime.Now.Year.ToString(); - plan.START_DATE = DateTime.Now; + //plan.START_DATE = DateTime.Now; //plan.END_DATE = dtEnd; plan.ISAUTO = true; plans.Add(plan); @@ -1857,8 +1857,29 @@ namespace APT.PP.WebApi.Controllers.Api } i++; } + //var departTypes = departTemps.Select(t => t.DEPARTMENT_TYPE).Distinct().ToList(); + //var typeList = ""; var nameList = ""; var postList = ""; + //int j = 1; + //foreach (var type in departTypes) + //{ + // var typeTemp = j + "、" + Enum.GetName(typeof(FMDepartmentType), type); + // typeList = typeList + temp; + // var departNames = departTemps.Where(t=>t.DEPARTMENT_TYPE == type).Select(t => t.NAME).Distinct().ToList(); + // var nameTemp = j + "、" + string.Join(",", departNames); + // nameList = nameList + nameTemp; + // var departTempIds = departTemps.Where(t => t.DEPARTMENT_TYPE == type).Select(t => t.ID).Distinct().ToList(); + // var postTempIds = users.Where(t => departTempIds.Contains((Guid)t.DEPARTMENT_ID) && t.Nav_Person != null).Select(m => m.Nav_Person.POST_ID).Distinct().ToList(); + // var postTemps = userPosts.Where(t => postTempIds.Contains(t.ID)).Select(m => m.NAME).Distinct().ToList(); + // var postTemp = j + "、" + string.Join(",", postTemps); + // postList = postList + postTemp; + // j++; + //} + //ideDetail.DEPARTMENT_TYPE = typeList; + //ideDetail.IDENTIFY_DEPARTMENT = nameList; + //ideDetail.IDENTIFY_POST = postList; } } + resultDetails.Add(ideDetail); } } @@ -2025,6 +2046,26 @@ namespace APT.PP.WebApi.Controllers.Api } i++; } + //var departTypes = departTemps.Select(t => t.DEPARTMENT_TYPE).Distinct().ToList(); + //var typeList = ""; var nameList = ""; var postList = ""; + //int j = 1; + //foreach (var type in departTypes) + //{ + // var typeTemp = j + "、" + Enum.GetName(typeof(FMDepartmentType), type); + // typeList = typeList + temp; + // var departNames = departTemps.Where(t => t.DEPARTMENT_TYPE == type).Select(t => t.NAME).Distinct().ToList(); + // var nameTemp = j + "、" + string.Join(",", departNames); + // nameList = nameList + nameTemp; + // var departTempIds = departTemps.Where(t => t.DEPARTMENT_TYPE == type).Select(t => t.ID).Distinct().ToList(); + // var postTempIds = users.Where(t => departTempIds.Contains((Guid)t.DEPARTMENT_ID) && t.Nav_Person != null).Select(m => m.Nav_Person.POST_ID).Distinct().ToList(); + // var postTemps = userPosts.Where(t => postTempIds.Contains(t.ID)).Select(m => m.NAME).Distinct().ToList(); + // var postTemp = j + "、" + string.Join(",", postTemps); + // postList = postList + postTemp; + // j++; + //} + //ideDetail.DEPARTMENT_TYPE = typeList; + //ideDetail.IDENTIFY_DEPARTMENT = nameList; + //ideDetail.IDENTIFY_POST = postList; } } resultDetails.Add(ideDetail); @@ -2231,7 +2272,27 @@ namespace APT.PP.WebApi.Controllers.Api } i++; } - } + //var departTypes = departTemps.Select(t => t.DEPARTMENT_TYPE).Distinct().ToList(); + //var typeList = ""; var nameList = ""; var postList = ""; + //int j = 1; + //foreach (var type in departTypes) + //{ + // var typeTemp = j + "、" + Enum.GetName(typeof(FMDepartmentType), type); + // typeList = typeList + temp; + // var departNames = departTemps.Where(t => t.DEPARTMENT_TYPE == type).Select(t => t.NAME).Distinct().ToList(); + // var nameTemp = j + "、" + string.Join(",", departNames); + // nameList = nameList + nameTemp; + // var departTempIds = departTemps.Where(t => t.DEPARTMENT_TYPE == type).Select(t => t.ID).Distinct().ToList(); + // var postTempIds = users.Where(t => departTempIds.Contains((Guid)t.DEPARTMENT_ID) && t.Nav_Person != null).Select(m => m.Nav_Person.POST_ID).Distinct().ToList(); + // var postTemps = userPosts.Where(t => postTempIds.Contains(t.ID)).Select(m => m.NAME).Distinct().ToList(); + // var postTemp = j + "、" + string.Join(",", postTemps); + // postList = postList + postTemp; + // j++; + //} + //ideDetail.DEPARTMENT_TYPE = typeList; + //ideDetail.IDENTIFY_DEPARTMENT = nameList; + //ideDetail.IDENTIFY_POST = postList; + } } resultDetails.Add(ideDetail); } diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/EnterpriseLibraryController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/EnterpriseLibraryController.cs index b8eff95..935a2c5 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/EnterpriseLibraryController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/EnterpriseLibraryController.cs @@ -675,6 +675,7 @@ namespace APT.SK.WebApi.Controllers.Api pageFilter.Include.Add("Nav_RiskName"); pageFilter.Include.Add("Nav_Details"); pageFilter.Include.Add("Nav_ProductionUnit"); + pageFilter.Include.Add("Nav_Posts"); pageFilter.SelectField.Add("Nav_ProductionUnit.NAME"); pageFilter.SelectField.Add("Nav_Details.NUM"); pageFilter.SelectField.Add("Nav_Details.MEASURES_NAME"); diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationController.cs index a576eb0..aadb513 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationController.cs @@ -137,7 +137,8 @@ namespace APT.SK.WebApi.Controllers.Api de.SCOREE_ID = item.SCOREE_ID; de.SCOREC_ID = item.SCOREC_ID; de.EVALUATE_SCORE = item.EVALUATE_SCORE; - if (item.SCOREL_ID == null || item.SCOREE_ID == null || item.SCOREC_ID == null) + de.EVALUATE_LEVEL = item.EVALUATE_LEVEL; + if ((item.SCOREL_ID == null || item.SCOREE_ID == null || item.SCOREC_ID == null) && item.ENABLE_STATUS == SKEnableStatusEnum.Yes) { throw new Exception("第" + item.NUM + "行，LEC都不能为空"); } @@ -348,7 +349,7 @@ namespace APT.SK.WebApi.Controllers.Api { var detailIds = details.Select(t => t.ID).ToList(); var measures = this.GetEntities(t => detailIds.Contains(t.RISK_EVALUATION_DETAIL_ID), new BaseFilter(filter.OrgId)); - var departs = this.GetEntities(t => detailIds.Contains(t.RISK_EVALUATION_DETAIL_ID), new BaseFilter(filter.OrgId), "Nav_Department", "Nav_User"); + var departs = this.GetEntities(t => detailIds.Contains(t.RISK_EVALUATION_DETAIL_ID), new BaseFilter(filter.OrgId), "Nav_Department.Nav_User"); var posts = this.GetEntities(t => detailIds.Contains(t.RISK_EVALUATION_DETAIL_ID), new BaseFilter(filter.OrgId), "Nav_Department", "Nav_PostDetails.Nav_Post"); foreach (var detail in details) { diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationSummaryController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationSummaryController.cs index e473067..020363f 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationSummaryController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationSummaryController.cs @@ -82,7 +82,13 @@ namespace APT.SK.WebApi.Controllers.Api de.TYPE_ID = item.TYPE_ID; de.ENABLE_STATUS = item.ENABLE_STATUS; de.MARK = item.MARK; - de.EMERGENCY = item.EMERGENCY; + de.EMERGENCY = item.EMERGENCY; + de.ENTERPRISE_LIBRARY_ID = item.ENTERPRISE_LIBRARY_ID; + de.SCOREL_ID = item.SCOREL_ID; + de.SCOREE_ID = item.SCOREE_ID; + de.SCOREC_ID = item.SCOREC_ID; + de.EVALUATE_SCORE = item.EVALUATE_SCORE; + de.EVALUATE_LEVEL = item.EVALUATE_LEVEL; if (item.Nav_DetailMeasures != null && item.Nav_DetailMeasures.Any()) { foreach (var mm in item.Nav_DetailMeasures) @@ -254,7 +260,7 @@ namespace APT.SK.WebApi.Controllers.Api { var detailIds = details.Select(t => t.ID).ToList(); var measures = this.GetEntities(t => detailIds.Contains(t.RISK_EVALUATION_SUMMARY_DETAIL_ID), new BaseFilter(filter.OrgId)); - var departs = this.GetEntities(t => detailIds.Contains(t.RISK_EVALUATION_SUMMARY_DETAIL_ID), new BaseFilter(filter.OrgId), "Nav_Department", "Nav_User"); + var departs = this.GetEntities(t => detailIds.Contains(t.RISK_EVALUATION_SUMMARY_DETAIL_ID), new BaseFilter(filter.OrgId), "Nav_Department.Nav_User"); var posts = this.GetEntities(t => detailIds.Contains(t.RISK_EVALUATION_SUMMARY_DETAIL_ID), new BaseFilter(filter.OrgId), "Nav_Department", "Nav_PostDetails.Nav_Post"); foreach (var detail in details) {