From 839919c37a00a55bc57b21bcf519a113fcbd37ba Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期六, 22 二月 2025 17:22:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java | 123 +++++++++++++++++++++++++++++------------
1 files changed, 87 insertions(+), 36 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 92b9efc..47ece3d 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;
@@ -39,13 +40,13 @@
import com.ycl.framework.utils.PageUtil;
import com.ycl.listener.excel.ProjectImportListener;
import com.ycl.mapper.*;
-import com.ycl.service.FileService;
-import com.ycl.service.ProjectInfoService;
-import com.ycl.service.ProjectInfoWinUnitService;
-import com.ycl.service.ProjectInfoYearPlanService;
+import com.ycl.service.*;
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.aop.framework.AopContext;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
@@ -93,6 +94,8 @@
private final ProjectInvestmentPolicyComplianceServiceImpl projectInvestmentPolicyComplianceServiceImpl;
private final ProjectUnitRegistrationInfoServiceImpl projectUnitRegistrationInfoServiceImpl;
private final SysDeptMapper sysDeptMapper;
+ private final ISysDictDataService dictDataService;
+
/**
* 娣诲姞
@@ -101,18 +104,20 @@
* @return
*/
@Override
- @Transactional(rollbackFor = Exception.class)
public Result add(ProjectInfoForm form) {
//娣诲姞鍩烘湰淇℃伅
ProjectInfo entity = ProjectInfoForm.getEntityByForm(form, null);
Long userId = SecurityUtils.getUserId();
- Long deptId = SecurityUtils.getDeptId();
- entity.setProjectOwnerUnit(deptId);
+// Long deptId = SecurityUtils.getDeptId();
+// entity.setProjectOwnerUnit(deptId);
entity.setCreateBy(userId);
entity.setUpdateBy(userId);
- //濡傛灉涓嶆槸鍌ㄥ椤圭洰(涓嶆槸鏈紑宸ラ」鐩�)涓嶉渶瑕佸鏍�
- if(ProjectConstant.COMMIT.equals(entity.getUsedStatus()) && ProjectStatusEnum.PENDDING.getType().equals(entity.getProjectStatus())){
+ //濡傛灉鏄偍澶囬」鐩�(鏈紑宸ラ」鐩�)涓嶉渶瑕佸鏍�
+ if (ProjectConstant.COMMIT.equals(entity.getUsedStatus()) && ProjectStatusEnum.PENDDING.getType().equals(entity.getProjectStatus())) {
entity.setUsedStatus(ProjectConstant.PASS);
+ }
+ if(!checkProjectNameAndIdIsUnique(entity,null)){
+ return Result.error("椤圭洰鍚嶆垨椤圭洰鐮佸凡瀛樺湪");
}
baseMapper.insert(entity);
addPlan(entity.getId()); //娣诲姞璁″垝琛�
@@ -125,13 +130,39 @@
fileService.saveBatch(fileList);
//娣诲姞椤圭洰涓爣鍗曚綅
- saveUnit(entity.getId(),form.getWinUnitList());
+ saveUnit(entity.getId(), form.getWinUnitList());
//娣诲姞骞村害鎶曡祫璁″垝
- saveYearPlan(entity.getId(),form.getYearPlanList());
+ saveYearPlan(entity.getId(), form.getYearPlanList());
return Result.ok("娣诲姞鎴愬姛").data(entity.getId());
}
+ /**
+ * 鍒ゆ柇椤圭洰鍚嶅拰椤圭洰鐮佹槸鍚﹀敮涓�
+ * @param entity from true 鏉ヨ嚜add() false 鏉ヨ嚜edit()
+ * @return
+ */
+ public boolean checkProjectNameAndIdIsUnique(ProjectInfo entity,Long updateId){
+ QueryWrapper<ProjectInfo> queryWrapper = new QueryWrapper<ProjectInfo>();
+ if (updateId == null) {
+ queryWrapper.eq("project_name", entity.getProjectName());
+
+ if (StringUtils.isNotEmpty(entity.getProjectCode())) {
+ queryWrapper.or();
+ queryWrapper.eq("project_code", entity.getProjectCode());
+ }
+
+ List<ProjectInfo> project = projectInfoMapper.selectList(queryWrapper);
+
+ return project == null || project.isEmpty();
+ }else {
+
+ List<ProjectInfo> project = projectInfoMapper.checkProjectNameAndIdIsUnique(updateId,entity.getProjectName(),entity.getProjectCode());
+
+ return project == null || project.isEmpty();
+ }
+
+ }
public void addPlan(Long projectInfoId) {
Plan plan = new Plan();
@@ -151,14 +182,21 @@
* @return
*/
@Override
- @Transactional(rollbackFor = Exception.class)
public Result update(ProjectInfoForm form) {
ProjectInfo entity = baseMapper.selectById(form.getId());
+
// 涓虹┖鎶汭llegalArgumentException锛屽仛鍏ㄥ眬寮傚父澶勭悊
Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
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);
+ }
+ if(!checkProjectNameAndIdIsUnique(entity,form.getId())){
+ return Result.error("椤圭洰鍚嶆垨椤圭洰鐮佸凡瀛樺湪");
+ }
//鏇存柊椤圭洰淇℃伅
baseMapper.updateById(entity);
List<File> fileList = form.getFileList();
@@ -178,22 +216,22 @@
//淇敼椤圭洰涓爣鍗曚綅
//鍒犻櫎鍘熸暟鎹�
QueryWrapper<ProjectInfoWinUnit> unitWrapper = new QueryWrapper<>();
- unitWrapper.eq("project_info_id",form.getId());
+ unitWrapper.eq("project_info_id", form.getId());
projectInfoWinUnitService.remove(unitWrapper);
//娣诲姞椤圭洰涓爣鍗曚綅
- saveUnit(entity.getId(),form.getWinUnitList());
+ saveUnit(entity.getId(), form.getWinUnitList());
//淇敼骞村害鎶曡祫璁″垝
//鍒犻櫎鍘熸暟鎹�
QueryWrapper<ProjectInfoYearPlan> yearPlanWrapper = new QueryWrapper<>();
- unitWrapper.eq("project_info_id",form.getId());
+ unitWrapper.eq("project_info_id", form.getId());
projectInfoYearPlanService.remove(yearPlanWrapper);
//娣诲姞骞村害鎶曡祫璁″垝
- saveYearPlan(entity.getId(),form.getYearPlanList());
+ saveYearPlan(entity.getId(), form.getYearPlanList());
return Result.ok("淇敼鎴愬姛");
}
- private void saveUnit(Long id,List<ProjectInfoWinUnitForm> projectInfoWinUnitForm) {
+ private void saveUnit(Long id, List<ProjectInfoWinUnitForm> projectInfoWinUnitForm) {
List<ProjectInfoWinUnit> projectInfoWinUnits = new ArrayList<>();
for (ProjectInfoWinUnitForm winUnitForm : projectInfoWinUnitForm) {
ProjectInfoWinUnit projectInfoWinUnit = ProjectInfoWinUnitForm.getEntityByForm(winUnitForm, null);
@@ -205,6 +243,7 @@
projectInfoWinUnitService.saveBatch(projectInfoWinUnits);
}
}
+
private void saveYearPlan(Long id, List<ProjectInfoYearPlanForm> yearPlanList) {
List<ProjectInfoYearPlan> projectInfoYearPlans = new ArrayList<>();
for (ProjectInfoYearPlanForm yearPlanForm : yearPlanList) {
@@ -217,6 +256,7 @@
projectInfoYearPlanService.saveBatch(projectInfoYearPlans);
}
}
+
/**
* 鎵归噺鍒犻櫎
*
@@ -242,8 +282,8 @@
investmentInfoMapper.delete(new QueryWrapper<ProjectInvestmentInfo>().eq("project_id", id));
policyMapper.delete(new QueryWrapper<ProjectInvestmentPolicyCompliance>().eq("project_id", id));
unitRegistrationInfoMapper.delete(new QueryWrapper<ProjectUnitRegistrationInfo>().eq("project_id", id));
- projectInfoWinUnitService.remove(new QueryWrapper<ProjectInfoWinUnit>().eq("project_info_id",id));
- projectInfoYearPlanService.remove(new QueryWrapper<ProjectInfoYearPlan>().eq("project_info_id",id));
+ projectInfoWinUnitService.remove(new QueryWrapper<ProjectInfoWinUnit>().eq("project_info_id", id));
+ projectInfoYearPlanService.remove(new QueryWrapper<ProjectInfoYearPlan>().eq("project_info_id", id));
List<String> types = new ArrayList<>();
types.add(FileTypeEnum.PROJECT_INFO.getType());
@@ -291,12 +331,12 @@
String ancestors = sysDeptMapper.selectAncestors(userId);
String[] ancestorArr = ancestors.split(",");
List<String> ancestorList = Arrays.stream(ancestorArr).collect(Collectors.toList());
- ancestorList.add(SecurityUtils.getDeptId()+"");
- if(!CollectionUtils.isEmpty(ancestorList) && ancestorList.contains("101")){
+ ancestorList.add(SecurityUtils.getDeptId() + "");
+ if (!CollectionUtils.isEmpty(ancestorList) && ancestorList.contains("101")) {
query.setProjectOwnerUnit(SecurityUtils.getDeptId());
//涓氫富
query.setRole(0);
- }else if(!CollectionUtils.isEmpty(ancestorList) && ancestorList.contains("102")){
+ } else if (!CollectionUtils.isEmpty(ancestorList) && ancestorList.contains("102")) {
query.setCompetentDepartment(SecurityUtils.getDeptId());
//瀹℃壒 瀵瑰簲涓荤閮ㄩ棬
query.setRole(1);
@@ -312,9 +352,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());
@@ -357,7 +404,7 @@
List<ProjectInfoWinUnitVO> unitVOS = new ArrayList<>();
List<ProjectInfoWinUnit> unitList = projectInfoWinUnitService.list(new QueryWrapper<ProjectInfoWinUnit>().eq("project_info_id", id));
for (ProjectInfoWinUnit projectInfoWinUnit : unitList) {
- ProjectInfoWinUnitVO unitVO = ProjectInfoWinUnitVO.getVoByEntity(projectInfoWinUnit,null);
+ ProjectInfoWinUnitVO unitVO = ProjectInfoWinUnitVO.getVoByEntity(projectInfoWinUnit, null);
unitVO.setId(null);
unitVOS.add(unitVO);
}
@@ -366,7 +413,7 @@
List<ProjectInfoYearPlanVO> yearPlanVOS = new ArrayList<>();
List<ProjectInfoYearPlan> yearPlaList = projectInfoYearPlanService.list(new QueryWrapper<ProjectInfoYearPlan>().eq("project_info_id", id));
for (ProjectInfoYearPlan yearPlan : yearPlaList) {
- ProjectInfoYearPlanVO yearPlanVO = ProjectInfoYearPlanVO.getVoByEntity(yearPlan,null);
+ ProjectInfoYearPlanVO yearPlanVO = ProjectInfoYearPlanVO.getVoByEntity(yearPlan, null);
yearPlanVO.setId(null);
yearPlanVOS.add(yearPlanVO);
}
@@ -424,7 +471,8 @@
city.add(item);
} else if (ImportanceTypeEnum.SHEHONG_KEY.getType().equals(item.getImportanceType())) {
county.add(item);
- } else if (ImportanceTypeEnum.NORMAL.getType().equals(item.getImportanceType())) {
+ } else // if (ImportanceTypeEnum.NORMAL.getType().equals(item.getImportanceType()))
+ {
normal.add(item);
}
});
@@ -432,22 +480,22 @@
proPhaseCountVO.add(new IndexProPhaseCountVO("鍌ㄥ瑙勫垝闃舵", reserve.size(), reserve.stream().
filter(item -> !StringUtils.isEmpty(item.getTotalInvestment()))
.map(item -> new BigDecimal(item.getTotalInvestment()).setScale(2, RoundingMode.HALF_UP))
- .reduce(BigDecimal.ZERO, BigDecimal::add).divide(new BigDecimal("100000000"), 2, RoundingMode.HALF_UP).toString(), "鍌�"));
+ .reduce(BigDecimal.ZERO, BigDecimal::add).divide(new BigDecimal("10000"), 2, RoundingMode.HALF_UP).toString(), "鍌�"));
proPhaseCountVO.add(new IndexProPhaseCountVO("椤圭洰鍓嶆湡闃舵", previous.size(), previous.stream().
filter(item -> !StringUtils.isEmpty(item.getTotalInvestment()))
.map(item -> new BigDecimal(item.getTotalInvestment()).setScale(2, RoundingMode.HALF_UP))
- .reduce(BigDecimal.ZERO, BigDecimal::add).divide(new BigDecimal("100000000"), 2, RoundingMode.HALF_UP).toString(), "鏂�"));
+ .reduce(BigDecimal.ZERO, BigDecimal::add).divide(new BigDecimal("10000"), 2, RoundingMode.HALF_UP).toString(), "鏂�"));
proPhaseCountVO.add(new IndexProPhaseCountVO("瀹炴柦闃舵", implement.size(), implement.stream().
filter(item -> !StringUtils.isEmpty(item.getTotalInvestment()))
.map(item -> new BigDecimal(item.getTotalInvestment()).setScale(2, RoundingMode.HALF_UP))
- .reduce(BigDecimal.ZERO, BigDecimal::add).divide(new BigDecimal("100000000"), 2, RoundingMode.HALF_UP).toString(), "寤�"));
+ .reduce(BigDecimal.ZERO, BigDecimal::add).divide(new BigDecimal("10000"), 2, RoundingMode.HALF_UP).toString(), "寤�"));
proPhaseCountVO.add(new IndexProPhaseCountVO("绔ｅ伐鎶曠敤闃舵", finish.size(), finish.stream().
filter(item -> !StringUtils.isEmpty(item.getTotalInvestment()))
.map(item -> new BigDecimal(item.getTotalInvestment()).setScale(2, RoundingMode.HALF_UP))
- .reduce(BigDecimal.ZERO, BigDecimal::add).divide(new BigDecimal("100000000"), 2, RoundingMode.HALF_UP).toString(), "绔�"));
+ .reduce(BigDecimal.ZERO, BigDecimal::add).divide(new BigDecimal("10000"), 2, RoundingMode.HALF_UP).toString(), "绔�"));
indexCountVO.setProPhaseCountVO(proPhaseCountVO);
@@ -455,22 +503,22 @@
impTypeCountVO.add(new IndexImpTypeCountVO("涓�鑸」鐩�", normal.size(), normal.stream().
filter(item -> !StringUtils.isEmpty(item.getTotalInvestment()))
.map(item -> new BigDecimal(item.getTotalInvestment()).setScale(2, RoundingMode.HALF_UP))
- .reduce(BigDecimal.ZERO, BigDecimal::add).divide(new BigDecimal("100000000"), 2, RoundingMode.HALF_UP).toString(), "鏅�"));
+ .reduce(BigDecimal.ZERO, BigDecimal::add).divide(new BigDecimal("10000"), 2, RoundingMode.HALF_UP).toString(), "鏅�"));
impTypeCountVO.add(new IndexImpTypeCountVO("鍘块噸鐐归」鐩�", county.size(), county.stream().
filter(item -> !StringUtils.isEmpty(item.getTotalInvestment()))
.map(item -> new BigDecimal(item.getTotalInvestment()).setScale(2, RoundingMode.HALF_UP))
- .reduce(BigDecimal.ZERO, BigDecimal::add).divide(new BigDecimal("100000000"), 2, RoundingMode.HALF_UP).toString(), "鍘�"));
+ .reduce(BigDecimal.ZERO, BigDecimal::add).divide(new BigDecimal("10000"), 2, RoundingMode.HALF_UP).toString(), "鍘�"));
impTypeCountVO.add(new IndexImpTypeCountVO("甯傞噸鐐归」鐩�", city.size(), city.stream().
filter(item -> !StringUtils.isEmpty(item.getTotalInvestment()))
.map(item -> new BigDecimal(item.getTotalInvestment()).setScale(2, RoundingMode.HALF_UP))
- .reduce(BigDecimal.ZERO, BigDecimal::add).divide(new BigDecimal("100000000"), 2, RoundingMode.HALF_UP).toString(), "甯�"));
+ .reduce(BigDecimal.ZERO, BigDecimal::add).divide(new BigDecimal("10000"), 2, RoundingMode.HALF_UP).toString(), "甯�"));
impTypeCountVO.add(new IndexImpTypeCountVO("鐪侀噸鐐归」鐩�", province.size(), province.stream().
filter(item -> !StringUtils.isEmpty(item.getTotalInvestment()))
.map(item -> new BigDecimal(item.getTotalInvestment()).setScale(2, RoundingMode.HALF_UP))
- .reduce(BigDecimal.ZERO, BigDecimal::add).divide(new BigDecimal("100000000"), 2, RoundingMode.HALF_UP).toString(), "鐪�"));
+ .reduce(BigDecimal.ZERO, BigDecimal::add).divide(new BigDecimal("10000"), 2, RoundingMode.HALF_UP).toString(), "鐪�"));
indexCountVO.setImpTypeCountVO(impTypeCountVO);
return indexCountVO;
}
@@ -758,14 +806,17 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public Result editProject(ProjectForm form) {
if (ObjectUtil.isNotNull(form.getProjectInfoForm())) {
+
if (ObjectUtil.isNull(form.getProjectInfoForm().getId())) {
//鏂板
- add(form.getProjectInfoForm());
+ return ((ProjectInfoServiceImpl) AopContext.currentProxy()).add(form.getProjectInfoForm());
+
} else {
//鏇存柊
- update(form.getProjectInfoForm());
+ return ((ProjectInfoServiceImpl) AopContext.currentProxy()).update(form.getProjectInfoForm());
}
}
if (ObjectUtil.isNotNull(form.getProjectInvestmentInfoForm())) {
--
Gitblit v1.8.0