tjt_cz/tjt_czjs_backend
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化代码

Browse Source
This commit is contained in:
lzm
2026-04-29 17:13:18 +08:00
parent 29005c5ee8
commit e3e16f73cc
4 changed files with 8 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lyzsys-module-tjt/src/main/java/cn/iocoder/lyzsys/module/tjt/enums/ErrorCodeConstants.java
View File

@@ -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 ==========

4
lyzsys-module-tjt/src/main/java/cn/iocoder/lyzsys/module/tjt/enums/OutputSplitBizConstants.java
View File

@@ -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));
}

12
lyzsys-module-tjt/src/main/java/cn/iocoder/lyzsys/module/tjt/service/outputsplit/ProjectOutputSplitServiceImpl.java
View File

@@ -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;
}

19
lyzsys-module-tjt/src/main/java/cn/iocoder/lyzsys/module/tjt/service/report/ProjectOutputReportServiceImpl.java
View File

@@ -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<ProjectPlanningDO> 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<ProjectPlanningDO> 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<ProjectPlanningDO> planningList = sortPlanningList(projectPlanningMapper.selectListByProjectId(project.getId()).stream()
.filter(item -> ProjectPlanningBizTypeConstants.isMajor(item.getOwnershipType()))
.collect(Collectors.toList()));
List<ProjectPlanningDO> planningList = sortPlanningList(projectPlanningMapper.selectListByProjectId(project.getId()));
Map<Long, List<ProjectPlanningQuarterDO>> quarterMap = getQuarterMap(planningList);
List<ProjectPlanningDO> 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) {