From 1f2697051a87a7ca54734ccbf04a4bc8b0110907 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期五, 21 三月 2025 15:56:18 +0800
Subject: [PATCH] 建设内容
---
business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java | 47 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 34 insertions(+), 13 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 a7fb97f..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,6 +7,7 @@
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;
@@ -68,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;
@@ -153,7 +155,7 @@
* @return
*/
public boolean checkProjectNameAndIdIsUnique(ProjectInfo entity,Long updateId){
- QueryWrapper<ProjectInfo> queryWrapper = new QueryWrapper<ProjectInfo>();
+ LambdaQueryWrapper<ProjectInfo> queryWrapper = new LambdaQueryWrapper<>();
if (updateId == null) {
List<ProjectInfo> list = new LambdaQueryChainWrapper<>(baseMapper)
.eq(ProjectInfo::getProjectName, entity.getProjectName())
@@ -323,6 +325,9 @@
if (query.getProjectEndTime() != null) {
query.setProjectEndTime(DateUtils.getDayEnd(query.getProjectEndTime()));
}
+ if (YesOrNo.YES.getCode().equals(query.getCenter())) {
+ query.setProjectPhase("6");
+ }
// 寮傚父椤圭洰鏆傛椂杩斿洖绌�
if (YesOrNo.YES.getCode().equals(query.getExe())) {
return Result.ok().data(new ArrayList<>()).total(0);
@@ -348,12 +353,13 @@
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.getProjectPhase());
projectVO.setProjectPhase(phase);
@@ -363,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);
});
@@ -393,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());
@@ -464,15 +478,22 @@
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);
+ }
}
});
//鍗曚綅鍏堥粯璁や负鍏�
--
Gitblit v1.8.0