From c9128daf5216f13246ad5c5a8976fe04cbe7568d Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 20 二月 2025 11:32:50 +0800
Subject: [PATCH] 任务回显bug
---
business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java | 96 ++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 88 insertions(+), 8 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 2eb6d63..5987493 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
@@ -1,6 +1,5 @@
package com.ycl.service.impl;
-import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.io.IORuntimeException;
import cn.hutool.core.util.CharsetUtil;
import cn.hutool.core.util.ObjectUtil;
@@ -8,12 +7,10 @@
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.service.impl.ServiceImpl;
-import com.ycl.common.annotation.DataScope;
import com.ycl.common.base.Result;
import com.ycl.common.config.SysConfig;
import com.ycl.common.constant.Constants;
@@ -21,6 +18,7 @@
import com.ycl.common.enums.business.FileTypeEnum;
import com.ycl.common.enums.business.ImportanceTypeEnum;
import com.ycl.common.enums.business.ProjectCategoryEnum;
+import com.ycl.common.enums.business.ProjectStatusEnum;
import com.ycl.common.exception.base.BaseException;
import com.ycl.common.utils.CopyUtils;
import com.ycl.common.utils.DateUtils;
@@ -31,7 +29,7 @@
import com.ycl.common.utils.file.FileUploadUtils;
import com.ycl.common.utils.file.FileUtils;
import com.ycl.common.utils.poi.ExcelUtil;
-import com.ycl.controller.ProjectInfoController;
+import com.ycl.constant.ProjectConstant;
import com.ycl.domain.entity.*;
import com.ycl.domain.excel.ProjectExcelTemplate;
import com.ycl.domain.form.*;
@@ -43,6 +41,8 @@
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.system.mapper.SysDeptMapper;
import lombok.RequiredArgsConstructor;
import org.apache.commons.codec.Charsets;
@@ -61,15 +61,12 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.StandardCopyOption;
-import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import java.util.zip.ZipOutputStream;
/**
* 椤圭洰绠＄悊鍩虹淇℃伅琛� 鏈嶅姟瀹炵幇绫�
@@ -82,6 +79,8 @@
public class ProjectInfoServiceImpl extends ServiceImpl<ProjectInfoMapper, ProjectInfo> implements ProjectInfoService {
private final ProjectInfoMapper projectInfoMapper;
+ private final ProjectInfoWinUnitService projectInfoWinUnitService;
+ private final ProjectInfoYearPlanService projectInfoYearPlanService;
private final ProjectInvestmentFundingMapper investmentFundingMapper;
private final ProjectInvestmentInfoMapper investmentInfoMapper;
private final ProjectInvestmentPolicyComplianceMapper policyMapper;
@@ -111,6 +110,10 @@
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);
+ }
baseMapper.insert(entity);
addPlan(entity.getId()); //娣诲姞璁″垝琛�
//娣诲姞鏂囦欢
@@ -120,8 +123,15 @@
item.setType(FileTypeEnum.PROJECT_INFO);
});
fileService.saveBatch(fileList);
+
+ //娣诲姞椤圭洰涓爣鍗曚綅
+ saveUnit(entity.getId(),form.getWinUnitList());
+ //娣诲姞骞村害鎶曡祫璁″垝
+ saveYearPlan(entity.getId(),form.getYearPlanList());
return Result.ok("娣诲姞鎴愬姛").data(entity.getId());
}
+
+
public void addPlan(Long projectInfoId) {
Plan plan = new Plan();
@@ -149,6 +159,10 @@
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);
+ }
//鏇存柊椤圭洰淇℃伅
baseMapper.updateById(entity);
List<File> fileList = form.getFileList();
@@ -164,9 +178,49 @@
fileMapper.delete(fileQueryWrapper);
//鏇挎崲鎴愮幇鏈�
fileService.saveBatch(fileList);
+
+ //淇敼椤圭洰涓爣鍗曚綅
+ //鍒犻櫎鍘熸暟鎹�
+ QueryWrapper<ProjectInfoWinUnit> unitWrapper = new QueryWrapper<>();
+ unitWrapper.eq("project_info_id",form.getId());
+ projectInfoWinUnitService.remove(unitWrapper);
+ //娣诲姞椤圭洰涓爣鍗曚綅
+ saveUnit(entity.getId(),form.getWinUnitList());
+
+ //淇敼骞村害鎶曡祫璁″垝
+ //鍒犻櫎鍘熸暟鎹�
+ QueryWrapper<ProjectInfoYearPlan> yearPlanWrapper = new QueryWrapper<>();
+ unitWrapper.eq("project_info_id",form.getId());
+ projectInfoYearPlanService.remove(yearPlanWrapper);
+ //娣诲姞骞村害鎶曡祫璁″垝
+ saveYearPlan(entity.getId(),form.getYearPlanList());
return Result.ok("淇敼鎴愬姛");
}
+ private void saveUnit(Long id,List<ProjectInfoWinUnitForm> projectInfoWinUnitForm) {
+ List<ProjectInfoWinUnit> projectInfoWinUnits = new ArrayList<>();
+ for (ProjectInfoWinUnitForm winUnitForm : projectInfoWinUnitForm) {
+ ProjectInfoWinUnit projectInfoWinUnit = ProjectInfoWinUnitForm.getEntityByForm(winUnitForm, null);
+ projectInfoWinUnit.setId(null);
+ projectInfoWinUnit.setProjectInfoId(id);
+ projectInfoWinUnits.add(projectInfoWinUnit);
+ }
+ if (!CollectionUtils.isEmpty(projectInfoWinUnits)) {
+ projectInfoWinUnitService.saveBatch(projectInfoWinUnits);
+ }
+ }
+ private void saveYearPlan(Long id, List<ProjectInfoYearPlanForm> yearPlanList) {
+ List<ProjectInfoYearPlan> projectInfoYearPlans = new ArrayList<>();
+ for (ProjectInfoYearPlanForm yearPlanForm : yearPlanList) {
+ ProjectInfoYearPlan yearPlan = ProjectInfoYearPlanForm.getEntityByForm(yearPlanForm, null);
+ yearPlan.setId(null);
+ yearPlan.setProjectInfoId(id);
+ projectInfoYearPlans.add(yearPlan);
+ }
+ if (!CollectionUtils.isEmpty(projectInfoYearPlans)) {
+ projectInfoYearPlanService.saveBatch(projectInfoYearPlans);
+ }
+ }
/**
* 鎵归噺鍒犻櫎
*
@@ -192,6 +246,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));
List<String> types = new ArrayList<>();
types.add(FileTypeEnum.PROJECT_INFO.getType());
@@ -203,7 +259,7 @@
}
/**
- * 鍒嗛〉鏌ヨ
+ * 鍒嗛〉鏌ヨ锛孴ODO 椤圭洰涓績鐨勫垎椤典娇鐢ㄥ崟鐙殑鎺ュ彛锛屽幓鎺夊啓姝荤殑閫昏緫鎹㈡垚dept or鏌ヨ
*
* @param query
* @return
@@ -258,6 +314,8 @@
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 phase = ProjectCategoryEnum.getPhaseByProjectStatus(projectVO.getProjectStatus(), projectVO.getProcessId() != null);
projectVO.setProjectPhase(phase);
@@ -290,11 +348,33 @@
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())));
QueryWrapper<File> fileQueryWrapper = new QueryWrapper<>();
fileQueryWrapper.eq("type", FileTypeEnum.PROJECT_INFO.getType());
fileQueryWrapper.eq("bus_id", vo.getId());
+
List<File> files = fileMapper.selectList(fileQueryWrapper);
vo.setFileList(files);
+
+ //涓爣鍗曚綅
+ 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);
+ unitVO.setId(null);
+ unitVOS.add(unitVO);
+ }
+ vo.setWinUnitList(unitVOS);
+ //骞村害鎶曡祫璁″垝
+ 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);
+ yearPlanVO.setId(null);
+ yearPlanVOS.add(yearPlanVO);
+ }
+ vo.setYearPlanList(yearPlanVOS);
return Result.ok().data(vo);
}
--
Gitblit v1.8.0