From d1127f18844cdca09b5f69c8fbeb3788055fd793 Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期四, 20 二月 2025 17:00:27 +0800 Subject: [PATCH] 项目增加项目子类型字段 --- business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java b/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java index 32026cc..769294e 100644 --- a/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java +++ b/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java @@ -15,6 +15,7 @@ import com.ycl.common.config.SysConfig; import com.ycl.common.constant.Constants; import com.ycl.common.core.domain.BaseEntity; +import com.ycl.common.core.domain.entity.SysDictData; import com.ycl.common.enums.business.FileTypeEnum; import com.ycl.common.enums.business.ImportanceTypeEnum; import com.ycl.common.enums.business.ProjectCategoryEnum; @@ -44,6 +45,8 @@ import com.ycl.service.ProjectInfoWinUnitService; import com.ycl.service.ProjectInfoYearPlanService; import com.ycl.system.mapper.SysDeptMapper; +import com.ycl.system.service.ISysDeptService; +import com.ycl.system.service.ISysDictDataService; import lombok.RequiredArgsConstructor; import org.apache.commons.codec.Charsets; import org.springframework.stereotype.Service; @@ -93,6 +96,7 @@ private final ProjectInvestmentPolicyComplianceServiceImpl projectInvestmentPolicyComplianceServiceImpl; private final ProjectUnitRegistrationInfoServiceImpl projectUnitRegistrationInfoServiceImpl; private final SysDeptMapper sysDeptMapper; + private final ISysDictDataService dictDataService; /** * 娣诲姞 @@ -110,7 +114,7 @@ entity.setProjectOwnerUnit(deptId); entity.setCreateBy(userId); entity.setUpdateBy(userId); - //濡傛灉涓嶆槸鍌ㄥ椤圭洰(涓嶆槸鏈紑宸ラ」鐩�)涓嶉渶瑕佸鏍� + //濡傛灉鏄偍澶囬」鐩�(鏈紑宸ラ」鐩�)涓嶉渶瑕佸鏍� if(ProjectConstant.COMMIT.equals(entity.getUsedStatus()) && ProjectStatusEnum.PENDDING.getType().equals(entity.getProjectStatus())){ entity.setUsedStatus(ProjectConstant.PASS); } @@ -159,7 +163,7 @@ ProjectInfoForm.getEntityByForm(form, entity); Long userId = SecurityUtils.getUserId(); entity.setUpdateBy(userId); - //濡傛灉涓嶆槸鍌ㄥ椤圭洰(涓嶆槸鏈紑宸ラ」鐩�)涓嶉渶瑕佸鏍� + //濡傛灉鏄偍澶囬」鐩�(鏈紑宸ラ」鐩�)涓嶉渶瑕佸鏍� if(ProjectConstant.COMMIT.equals(entity.getUsedStatus()) && ProjectStatusEnum.PENDDING.getType().equals(entity.getProjectStatus())){ entity.setUsedStatus(ProjectConstant.PASS); } @@ -316,9 +320,16 @@ copyToProjectVO(vo, projectVO); List<Long> departmentList = vo.getCompetentDepartmentList(); projectVO.setAuditRole(SecurityUtils.isAdmin(SecurityUtils.getUserId()) || (!CollectionUtils.isEmpty(departmentList) && departmentList.contains(SecurityUtils.getDeptId()))); - //缈昏瘧椤圭洰闃舵 + // 缈昏瘧椤圭洰闃舵 String phase = ProjectCategoryEnum.getPhaseByProjectStatus(projectVO.getProjectStatus(), projectVO.getProcessId() != null); projectVO.setProjectPhase(phase); + if (StringUtils.isNotEmpty(projectVO.getProjectSubType())) { + // 缈昏瘧椤圭洰瀛愮被鍨� + SysDictData dictData = dictDataService.selectDictDataByValue(projectVO.getProjectType(), projectVO.getProjectSubType(), "sys_project_type"); + if (Objects.nonNull(dictData)) { + projectVO.setProjectSubType(dictData.getDictLabel()); + } + } list.add(projectVO); }); return Result.ok().data(list).total(page.getTotal()); -- Gitblit v1.8.0