From e3e16f73ccfafac3a418e99440330cb87f741353 Mon Sep 17 00:00:00 2001 From: lzm <2316711944@qq.com> Date: Wed, 29 Apr 2026 17:13:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/tjt/enums/ErrorCodeConstants.java | 1 - .../tjt/enums/OutputSplitBizConstants.java | 4 ---- .../ProjectOutputSplitServiceImpl.java | 12 ++++-------- .../ProjectOutputReportServiceImpl.java | 19 ++++--------------- 4 files changed, 8 insertions(+), 28 deletions(-) diff --git a/lyzsys-module-tjt/src/main/java/cn/iocoder/lyzsys/module/tjt/enums/ErrorCodeConstants.java b/lyzsys-module-tjt/src/main/java/cn/iocoder/lyzsys/module/tjt/enums/ErrorCodeConstants.java index af95f6e..463ee7a 100644 --- a/lyzsys-module-tjt/src/main/java/cn/iocoder/lyzsys/module/tjt/enums/ErrorCodeConstants.java +++ b/lyzsys-module-tjt/src/main/java/cn/iocoder/lyzsys/module/tjt/enums/ErrorCodeConstants.java @@ -33,7 +33,6 @@ public interface ErrorCodeConstants { // ========== 页面 4 拆分管理 1-020-004-000 ========== ErrorCode PROJECT_OUTPUT_SPLIT_PLANNING_NOT_EXISTS = new ErrorCode(1_020_004_000, "关联合约规划不存在"); - ErrorCode PROJECT_OUTPUT_SPLIT_NOT_MAJOR = new ErrorCode(1_020_004_001, "仅专业所记录允许进行页面4拆分"); ErrorCode PROJECT_OUTPUT_SPLIT_RATIO_INVALID = new ErrorCode(1_020_004_002, "页面4比例合计必须等于 100%"); // ========== 页面 5 角色拆分管理 1-020-005-000 ========== diff --git a/lyzsys-module-tjt/src/main/java/cn/iocoder/lyzsys/module/tjt/enums/OutputSplitBizConstants.java b/lyzsys-module-tjt/src/main/java/cn/iocoder/lyzsys/module/tjt/enums/OutputSplitBizConstants.java index 21601cf..6255cb3 100644 --- a/lyzsys-module-tjt/src/main/java/cn/iocoder/lyzsys/module/tjt/enums/OutputSplitBizConstants.java +++ b/lyzsys-module-tjt/src/main/java/cn/iocoder/lyzsys/module/tjt/enums/OutputSplitBizConstants.java @@ -69,10 +69,6 @@ public final class OutputSplitBizConstants { private OutputSplitBizConstants() { } - public static boolean isMajorOwnershipType(String value) { - return ProjectPlanningBizTypeConstants.isMajor(value); - } - public static boolean isValidSpecialtyCode(String code) { return ASSIGNMENT_SPECIALTY_ITEMS.stream().anyMatch(item -> item.getCode().equals(code)); } diff --git a/lyzsys-module-tjt/src/main/java/cn/iocoder/lyzsys/module/tjt/service/outputsplit/ProjectOutputSplitServiceImpl.java b/lyzsys-module-tjt/src/main/java/cn/iocoder/lyzsys/module/tjt/service/outputsplit/ProjectOutputSplitServiceImpl.java index 56da7c7..99bdf87 100644 --- a/lyzsys-module-tjt/src/main/java/cn/iocoder/lyzsys/module/tjt/service/outputsplit/ProjectOutputSplitServiceImpl.java +++ b/lyzsys-module-tjt/src/main/java/cn/iocoder/lyzsys/module/tjt/service/outputsplit/ProjectOutputSplitServiceImpl.java @@ -28,7 +28,6 @@ import java.util.stream.Collectors; import static cn.iocoder.lyzsys.framework.common.exception.util.ServiceExceptionUtil.exception; import static cn.iocoder.lyzsys.module.tjt.enums.ErrorCodeConstants.PROJECT_NOT_EXISTS; -import static cn.iocoder.lyzsys.module.tjt.enums.ErrorCodeConstants.PROJECT_OUTPUT_SPLIT_NOT_MAJOR; import static cn.iocoder.lyzsys.module.tjt.enums.ErrorCodeConstants.PROJECT_OUTPUT_SPLIT_PLANNING_NOT_EXISTS; import static cn.iocoder.lyzsys.module.tjt.enums.ErrorCodeConstants.PROJECT_OUTPUT_SPLIT_RATIO_INVALID; @@ -58,7 +57,7 @@ public class ProjectOutputSplitServiceImpl implements ProjectOutputSplitService @Override public ProjectOutputSplitRespVO getProjectOutputSplit(Long planningId) { - ProjectPlanningDO planning = validateMajorPlanning(planningId); + ProjectPlanningDO planning = validatePlanningExists(planningId); ProjectDO project = validateProjectExists(planning.getProjectId()); ProjectOutputSplitDO outputSplit = projectOutputSplitMapper.selectByPlanningId(planningId); if (outputSplit == null) { @@ -69,7 +68,7 @@ public class ProjectOutputSplitServiceImpl implements ProjectOutputSplitService @Override public Long saveProjectOutputSplit(ProjectOutputSplitSaveReqVO reqVO) { - ProjectPlanningDO planning = validateMajorPlanning(reqVO.getPlanningId()); + ProjectPlanningDO planning = validatePlanningExists(reqVO.getPlanningId()); validateOutputSplitRatios(reqVO); ProjectOutputSplitDO outputSplit = projectOutputSplitMapper.selectByPlanningId(reqVO.getPlanningId()); if (outputSplit == null) { @@ -92,7 +91,7 @@ public class ProjectOutputSplitServiceImpl implements ProjectOutputSplitService @Override public ProjectOutputSplitDO getOrCreateProjectOutputSplit(Long planningId) { - ProjectPlanningDO planning = validateMajorPlanning(planningId); + ProjectPlanningDO planning = validatePlanningExists(planningId); ProjectOutputSplitDO outputSplit = projectOutputSplitMapper.selectByPlanningId(planningId); if (outputSplit != null) { return outputSplit; @@ -165,14 +164,11 @@ public class ProjectOutputSplitServiceImpl implements ProjectOutputSplitService return respVO; } - private ProjectPlanningDO validateMajorPlanning(Long planningId) { + private ProjectPlanningDO validatePlanningExists(Long planningId) { ProjectPlanningDO planning = projectPlanningMapper.selectById(planningId); if (planning == null) { throw exception(PROJECT_OUTPUT_SPLIT_PLANNING_NOT_EXISTS); } - if (!OutputSplitBizConstants.isMajorOwnershipType(planning.getOwnershipType())) { - throw exception(PROJECT_OUTPUT_SPLIT_NOT_MAJOR); - } return planning; } diff --git a/lyzsys-module-tjt/src/main/java/cn/iocoder/lyzsys/module/tjt/service/report/ProjectOutputReportServiceImpl.java b/lyzsys-module-tjt/src/main/java/cn/iocoder/lyzsys/module/tjt/service/report/ProjectOutputReportServiceImpl.java index a0aea26..8968c44 100644 --- a/lyzsys-module-tjt/src/main/java/cn/iocoder/lyzsys/module/tjt/service/report/ProjectOutputReportServiceImpl.java +++ b/lyzsys-module-tjt/src/main/java/cn/iocoder/lyzsys/module/tjt/service/report/ProjectOutputReportServiceImpl.java @@ -67,7 +67,6 @@ import static cn.iocoder.lyzsys.framework.common.exception.util.ServiceException import static cn.iocoder.lyzsys.framework.common.exception.util.ServiceExceptionUtil.invalidParamException; import static cn.iocoder.lyzsys.module.tjt.enums.ErrorCodeConstants.OFFICE_NOT_EXISTS; import static cn.iocoder.lyzsys.module.tjt.enums.ErrorCodeConstants.PROJECT_NOT_EXISTS; -import static cn.iocoder.lyzsys.module.tjt.enums.ErrorCodeConstants.PROJECT_OUTPUT_SPLIT_NOT_MAJOR; import static cn.iocoder.lyzsys.module.tjt.enums.ErrorCodeConstants.PROJECT_PLANNING_NOT_EXISTS; import static cn.iocoder.lyzsys.module.tjt.enums.ErrorCodeConstants.SPECIALTY_ROLE_SPLIT_SPECIALTY_INVALID; @@ -169,7 +168,7 @@ public class ProjectOutputReportServiceImpl implements ProjectOutputReportServic @Override public void exportProjectQuarterOutputExcel(HttpServletResponse response, ProjectQuarterOutputExportReqVO reqVO) throws IOException { - ProjectPlanningDO anchorPlanning = validateMajorPlanning(reqVO.getPlanningId()); + ProjectPlanningDO anchorPlanning = validatePlanningExists(reqVO.getPlanningId()); ProjectDO project = validateProjectExists(anchorPlanning.getProjectId()); Integer reportYear = LocalDate.now().getYear(); List planningList = sortPlanningList(projectPlanningMapper.selectListByProjectId(project.getId())); @@ -193,7 +192,7 @@ public class ProjectOutputReportServiceImpl implements ProjectOutputReportServic public void exportProjectLeadQuarterOutputExcel(HttpServletResponse response, ProjectLeadQuarterOutputExportReqVO reqVO) throws IOException { - ProjectPlanningDO anchorPlanning = validateMajorPlanning(reqVO.getPlanningId()); + ProjectPlanningDO anchorPlanning = validatePlanningExists(reqVO.getPlanningId()); ProjectDO project = validateProjectExists(anchorPlanning.getProjectId()); Integer reportYear = LocalDate.now().getYear(); List planningList = projectPlanningMapper.selectListByProjectId(project.getId()).stream() @@ -273,12 +272,10 @@ public class ProjectOutputReportServiceImpl implements ProjectOutputReportServic public void exportSpecialtyPersonOutputExcel(HttpServletResponse response, SpecialtyPersonOutputExportReqVO reqVO) throws IOException { validateSpecialtyCode(reqVO.getSpecialtyCode()); - ProjectPlanningDO anchorPlanning = validateMajorPlanning(reqVO.getPlanningId()); + ProjectPlanningDO anchorPlanning = validatePlanningExists(reqVO.getPlanningId()); ProjectDO project = validateProjectExists(anchorPlanning.getProjectId()); Integer reportYear = LocalDate.now().getYear(); - List planningList = sortPlanningList(projectPlanningMapper.selectListByProjectId(project.getId()).stream() - .filter(item -> ProjectPlanningBizTypeConstants.isMajor(item.getOwnershipType())) - .collect(Collectors.toList())); + List planningList = sortPlanningList(projectPlanningMapper.selectListByProjectId(project.getId())); Map> quarterMap = getQuarterMap(planningList); List relevantPlanningList = planningList.stream() .filter(item -> hasYearAmount(quarterMap.get(item.getId()), reportYear)) @@ -524,14 +521,6 @@ public class ProjectOutputReportServiceImpl implements ProjectOutputReportServic return planning; } - private ProjectPlanningDO validateMajorPlanning(Long planningId) { - ProjectPlanningDO planning = validatePlanningExists(planningId); - if (!ProjectPlanningBizTypeConstants.isMajor(planning.getOwnershipType())) { - throw exception(PROJECT_OUTPUT_SPLIT_NOT_MAJOR); - } - return planning; - } - private ProjectDO validateProjectExists(Long projectId) { ProjectDO project = projectMapper.selectById(projectId); if (project == null) {