From c4ab6a24d2825f11a0de0f165667dc533c458a01 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期五, 21 三月 2025 10:57:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java | 141 ++++++++++++++++++++++++----------------------
1 files changed, 74 insertions(+), 67 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 ac53878..cde781f 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
@@ -7,9 +7,11 @@
import cn.hutool.core.util.ZipUtil;
import com.alibaba.excel.EasyExcel;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.common.base.Result;
@@ -17,6 +19,7 @@
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.YesOrNo;
import com.ycl.common.enums.business.FileTypeEnum;
import com.ycl.common.enums.business.ImportanceTypeEnum;
import com.ycl.common.enums.business.ProjectCategoryEnum;
@@ -66,6 +69,7 @@
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.StandardCopyOption;
+import java.time.Year;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -151,23 +155,20 @@
* @return
*/
public boolean checkProjectNameAndIdIsUnique(ProjectInfo entity,Long updateId){
- QueryWrapper<ProjectInfo> queryWrapper = new QueryWrapper<ProjectInfo>();
+ LambdaQueryWrapper<ProjectInfo> queryWrapper = new LambdaQueryWrapper<>();
if (updateId == null) {
-
- queryWrapper.eq("project_name", entity.getProjectName());
- queryWrapper.eq("deleted",0);
- if (StringUtils.isNotEmpty(entity.getProjectCode())) {
- 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();
+ List<ProjectInfo> list = new LambdaQueryChainWrapper<>(baseMapper)
+ .eq(ProjectInfo::getProjectName, entity.getProjectName())
+ .eq(ProjectInfo::getProjectCode, entity.getProjectCode())
+ .list();
+ return list == null || list.isEmpty();
+ } else {
+ List<ProjectInfo> list = new LambdaQueryChainWrapper<>(baseMapper)
+ .eq(ProjectInfo::getProjectName, entity.getProjectName())
+ .eq(ProjectInfo::getProjectCode, entity.getProjectCode())
+ .ne(ProjectInfo::getId, updateId)
+ .list();
+ return list == null || list.isEmpty();
}
}
@@ -324,8 +325,11 @@
if (query.getProjectEndTime() != null) {
query.setProjectEndTime(DateUtils.getDayEnd(query.getProjectEndTime()));
}
+ if (YesOrNo.YES.getCode().equals(query.getCenter())) {
+ query.setProjectPhase("6");
+ }
// 寮傚父椤圭洰鏆傛椂杩斿洖绌�
- if (ProjectCategoryEnum.EXCEPTION.getType().equals(query.getProjectPhase())) {
+ if (YesOrNo.YES.getCode().equals(query.getExe())) {
return Result.ok().data(new ArrayList<>()).total(0);
}
Long userId = SecurityUtils.getUserId();
@@ -349,14 +353,15 @@
baseMapper.getPage(query, page);
List<ProjectInfoVO> records = page.getRecords();
List<ProjectVO> list = new ArrayList<>();
+ int year = Year.now().getValue();
records.forEach(vo -> {
ProjectInfoVO.transform(vo);
ProjectVO projectVO = new ProjectVO();
copyToProjectVO(vo, projectVO);
- List<Long> departmentList = vo.getCompetentDepartmentList();
- projectVO.setAuditRole(SecurityUtils.isAdmin(SecurityUtils.getUserId()) || (!CollectionUtils.isEmpty(departmentList) && departmentList.contains(SecurityUtils.getDeptId())));
+ String competentDepartment = vo.getCompetentDepartment();
+ projectVO.setAuditRole(SecurityUtils.isAdmin(SecurityUtils.getUserId()) || (StringUtils.isNotEmpty(competentDepartment) && competentDepartment.equals(SecurityUtils.getDeptId() + "")));
// 缈昏瘧椤圭洰闃舵
- String phase = ProjectCategoryEnum.getPhaseByProjectStatus(projectVO.getProjectStatus(), projectVO.getProcessId() != null);
+ String phase = ProjectCategoryEnum.getPhaseByProjectStatus(projectVO.getProjectPhase());
projectVO.setProjectPhase(phase);
if (StringUtils.isNotEmpty(projectVO.getProjectSubType())) {
// 缈昏瘧椤圭洰瀛愮被鍨�
@@ -364,6 +369,14 @@
if (Objects.nonNull(dictData)) {
projectVO.setProjectSubType(dictData.getDictLabel());
}
+ }
+ // 鑾峰彇鏈勾搴︾殑鎶曡祫閲戦
+ List<ProjectInfoYearPlan> yearPlans = new LambdaQueryChainWrapper<>(projectInfoYearPlanService.getBaseMapper())
+ .eq(ProjectInfoYearPlan::getProjectInfoId, projectVO.getId())
+ .eq(ProjectInfoYearPlan::getYear, year)
+ .list();
+ if (! CollectionUtils.isEmpty(yearPlans)) {
+ projectVO.setYearInvestAmount(yearPlans.get(0).getYearTotalMoney());
}
list.add(projectVO);
});
@@ -394,8 +407,8 @@
ProjectInfo entity = baseMapper.getById(id);
Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
ProjectInfoVO vo = ProjectInfoVO.getVoByEntity(entity, null);
- List<Long> departmentList = vo.getCompetentDepartmentList();
- vo.setAuditRole(SecurityUtils.isAdmin(SecurityUtils.getUserId()) || (!CollectionUtils.isEmpty(departmentList) && departmentList.contains(SecurityUtils.getDeptId())));
+ String competentDepartment = vo.getCompetentDepartment();
+ vo.setAuditRole(SecurityUtils.isAdmin(SecurityUtils.getUserId()) || (StringUtils.isNotEmpty(competentDepartment) && competentDepartment.equals(SecurityUtils.getDeptId() + "")));
QueryWrapper<File> fileQueryWrapper = new QueryWrapper<>();
fileQueryWrapper.eq("type", FileTypeEnum.PROJECT_INFO.getType());
fileQueryWrapper.eq("bus_id", vo.getId());
@@ -455,25 +468,32 @@
List<ProjectVO> city = new ArrayList<>();
List<ProjectVO> county = new ArrayList<>();
projectVOS.forEach(item -> {
- if (ProjectCategoryEnum.RESERVE.getDesc().equals(ProjectCategoryEnum.getPhaseByProjectStatus(item.getProjectStatus(), item.getProcessId() != null))) {
+ if (ProjectCategoryEnum.RESERVE.getDesc().equals(ProjectCategoryEnum.getPhaseByProjectStatus(item.getProjectPhase()))) {
reserve.add(item);
- } else if (ProjectCategoryEnum.PREVIOUS.getDesc().equals(ProjectCategoryEnum.getPhaseByProjectStatus(item.getProjectStatus(), item.getProcessId() != null))) {
+ } else if (ProjectCategoryEnum.PREVIOUS.getDesc().equals(ProjectCategoryEnum.getPhaseByProjectStatus(item.getProjectPhase()))) {
previous.add(item);
- } else if (ProjectCategoryEnum.IMPLEMENT.getDesc().equals(ProjectCategoryEnum.getPhaseByProjectStatus(item.getProjectStatus(), item.getProcessId() != null))) {
+ } else if (ProjectCategoryEnum.IMPLEMENT.getDesc().equals(ProjectCategoryEnum.getPhaseByProjectStatus(item.getProjectPhase()))) {
implement.add(item);
- } else if (ProjectCategoryEnum.FINISH.getDesc().equals(ProjectCategoryEnum.getPhaseByProjectStatus(item.getProjectStatus(), item.getProcessId() != null))) {
+ } else if (ProjectCategoryEnum.FINISH.getDesc().equals(ProjectCategoryEnum.getPhaseByProjectStatus(item.getProjectPhase()))) {
finish.add(item);
}
- if (ImportanceTypeEnum.PROVINCIAL_KEY.getType().equals(item.getImportanceType())) {
- province.add(item);
- } else if (ImportanceTypeEnum.SUINING_KEY.getType().equals(item.getImportanceType())) {
- city.add(item);
- } else if (ImportanceTypeEnum.SHEHONG_KEY.getType().equals(item.getImportanceType())) {
- county.add(item);
- } else // if (ImportanceTypeEnum.NORMAL.getType().equals(item.getImportanceType()))
- {
+ if (StringUtils.isBlank(item.getImportanceType())) {
normal.add(item);
+ // 浣跨敤contains锛屽洜涓洪噸鐐瑰垎绫诲彲澶氶�夛紝浣跨敤,鍒嗗壊瀛樺偍鐨�
+ } else {
+ if (item.getImportanceType().contains(ImportanceTypeEnum.PROVINCIAL_KEY.getType())) {
+ province.add(item);
+ }
+ if (item.getImportanceType().contains(ImportanceTypeEnum.SUINING_KEY.getType())) {
+ city.add(item);
+ }
+ if (item.getImportanceType().contains(ImportanceTypeEnum.SHEHONG_KEY.getType())) {
+ county.add(item);
+ }
+ if (item.getImportanceType().contains(ImportanceTypeEnum.NORMAL.getType())) {
+ normal.add(item);
+ }
}
});
//鍗曚綅鍏堥粯璁や负鍏�
@@ -586,7 +606,7 @@
ProjectExcelTemplate excel = new ProjectExcelTemplate();
BeanUtils.copyProperties(item, excel);
//椤圭洰闃舵
- excel.setProjectPhase(ProjectCategoryEnum.getPhaseByProjectStatus(item.getProjectStatus(), item.getProcessId() != null));
+ excel.setProjectPhase(ProjectCategoryEnum.getPhaseByProjectStatus(item.getProjectPhase()));
excelList.add(excel);
});
Set<Integer> indexes = OutputExcelUtils.getSelectFields(query.getFieldList(), ProjectExcelTemplate.class);
@@ -817,7 +837,7 @@
entity.setCreateBy(userId);
entity.setUpdateBy(userId);
//濡傛灉鏄偍澶囬」鐩�(鏈紑宸ラ」鐩�)涓嶉渶瑕佸鏍�
- if (ProjectConstant.COMMIT.equals(entity.getUsedStatus()) && ProjectStatusEnum.PENDDING.getType().equals(entity.getProjectStatus())) {
+ if (ProjectCategoryEnum.RESERVE.getType().equals(entity.getProjectPhase())) {
entity.setUsedStatus(ProjectConstant.PASS);
}
// 绠＄悊鍛樹慨鏀圭殑鐩存帴閫氳繃
@@ -828,6 +848,7 @@
throw new RuntimeException("椤圭洰閲嶅锛岄」鐩悕绉般�侀」鐩爜宸插瓨鍦�");
}
baseMapper.insert(entity);
+ projectId = entity.getId();
addPlan(entity.getId()); //娣诲姞璁″垝琛�
//娣诲姞椤圭洰涓爣鍗曚綅
List<ProjectInfoWinUnit> projectInfoWinUnits = new ArrayList<>();
@@ -851,26 +872,6 @@
if (!CollectionUtils.isEmpty(projectInfoYearPlans)) {
projectInfoYearPlanService.saveBatch(projectInfoYearPlans);
}
- // 鏂板
- if (Objects.nonNull(form.getProjectInvestmentInfoForm())) {
- form.getProjectInvestmentInfoForm().setProjectId(projectId);
- projectInvestmentInfoServiceImpl.add(form.getProjectInvestmentInfoForm());
- }
-
- if (Objects.nonNull(form.getProjectInvestmentFundingForm())) {
- form.getProjectInvestmentFundingForm().setProjectId(projectId);
- projectInvestmentFundingServiceImpl.add(form.getProjectInvestmentFundingForm());
- }
-
- if (Objects.nonNull(form.getProjectInvestmentPolicyComplianceForm())) {
- form.getProjectInvestmentPolicyComplianceForm().setProjectId(projectId);
- projectInvestmentPolicyComplianceServiceImpl.add(form.getProjectInvestmentPolicyComplianceForm());
- }
-
- if (Objects.nonNull(form.getProjectUnitRegistrationInfoForm())) {
- form.getProjectUnitRegistrationInfoForm().setProjectId(projectId);
- projectUnitRegistrationInfoServiceImpl.add(form.getProjectUnitRegistrationInfoForm());
- }
} else {
//鏇存柊
ProjectInfo entity = baseMapper.selectById(form.getProjectInfoForm().getId());
@@ -881,7 +882,7 @@
Long userId = SecurityUtils.getUserId();
entity.setUpdateBy(userId);
//濡傛灉鏄偍澶囬」鐩�(鏈紑宸ラ」鐩�)涓嶉渶瑕佸鏍�
- if (ProjectConstant.COMMIT.equals(entity.getUsedStatus()) && ProjectStatusEnum.PENDDING.getType().equals(entity.getProjectStatus())) {
+ if (ProjectCategoryEnum.RESERVE.getType().equals(entity.getProjectPhase())) {
entity.setUsedStatus(ProjectConstant.PASS);
}
// 绠＄悊鍛樹慨鏀圭殑鐩存帴閫氳繃
@@ -926,19 +927,25 @@
if (!CollectionUtils.isEmpty(projectInfoYearPlans)) {
projectInfoYearPlanService.saveBatch(projectInfoYearPlans);
}
- // 鏇存柊
- if (Objects.nonNull(form.getProjectInvestmentInfoForm())) {
- projectInvestmentInfoServiceImpl.update(form.getProjectInvestmentInfoForm());
+ }
+
+ // 鏇存柊鍏跺畠椤圭洰淇℃伅琛�
+ if (Objects.nonNull(form.getProjectInvestmentFundingForm())) {
+ if (Objects.nonNull(form.getProjectInvestmentFundingForm().getId())) {
+ projectInvestmentFundingServiceImpl.update(form.getProjectInvestmentFundingForm());
+ } else {
+ form.getProjectInvestmentFundingForm().setProjectId(projectId);
+ projectInvestmentFundingServiceImpl.add(form.getProjectInvestmentFundingForm());
}
- if (Objects.nonNull(form.getProjectInvestmentFundingForm())) {
- projectInvestmentFundingServiceImpl.update();
- }
- if (Objects.nonNull(form.getProjectInvestmentPolicyComplianceForm())) {
- projectInvestmentPolicyComplianceServiceImpl.update(form.getProjectInvestmentPolicyComplianceForm());
- }
- if (Objects.nonNull(form.getProjectUnitRegistrationInfoForm())) {
+ }
+ if (Objects.nonNull(form.getProjectUnitRegistrationInfoForm())) {
+ if (Objects.nonNull(form.getProjectUnitRegistrationInfoForm().getId())) {
projectUnitRegistrationInfoServiceImpl.update(form.getProjectUnitRegistrationInfoForm());
+ } else {
+ form.getProjectUnitRegistrationInfoForm().setProjectId(projectId);
+ projectUnitRegistrationInfoServiceImpl.add(form.getProjectUnitRegistrationInfoForm());
}
+
}
}
return Result.ok("淇濆瓨鎴愬姛");
--
Gitblit v1.8.0