From 41d5af89f7de2961e03b2f630fbd0da6abef8566 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 03 三月 2025 10:00:32 +0800
Subject: [PATCH] 流程推进详情bug
---
business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java | 475 ++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 389 insertions(+), 86 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 0dd853d..42058b6 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java
@@ -1,21 +1,29 @@
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;
import cn.hutool.core.util.StrUtil;
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;
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.YesOrNo;
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;
@@ -26,24 +34,27 @@
import com.ycl.common.utils.file.FileUploadUtils;
import com.ycl.common.utils.file.FileUtils;
import com.ycl.common.utils.poi.ExcelUtil;
+import com.ycl.constant.ProjectConstant;
import com.ycl.domain.entity.*;
import com.ycl.domain.excel.ProjectExcelTemplate;
-import com.ycl.domain.form.DocumentInfoForm;
-import com.ycl.domain.form.PlanForm;
-import com.ycl.domain.form.ProjectInfoForm;
+import com.ycl.domain.form.*;
import com.ycl.domain.query.ProjectExportQuery;
import com.ycl.domain.query.ProjectInfoQuery;
import com.ycl.domain.vo.*;
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.*;
+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;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.ServletOutputStream;
@@ -55,15 +66,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;
/**
* 椤圭洰绠＄悊鍩虹淇℃伅琛� 鏈嶅姟瀹炵幇绫�
@@ -76,6 +84,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;
@@ -83,6 +93,13 @@
private final FileService fileService;
private final FileMapper fileMapper;
private final PlanMapper planMapper;
+ private final ProjectInvestmentInfoServiceImpl projectInvestmentInfoServiceImpl;
+ private final ProjectInvestmentFundingServiceImpl projectInvestmentFundingServiceImpl;
+ private final ProjectInvestmentPolicyComplianceServiceImpl projectInvestmentPolicyComplianceServiceImpl;
+ private final ProjectUnitRegistrationInfoServiceImpl projectUnitRegistrationInfoServiceImpl;
+ private final SysDeptMapper sysDeptMapper;
+ private final ISysDictDataService dictDataService;
+
/**
* 娣诲姞
@@ -91,23 +108,68 @@
* @return
*/
@Override
- @Transactional(rollbackFor = Exception.class)
public Result add(ProjectInfoForm form) {
//娣诲姞鍩烘湰淇℃伅
ProjectInfo entity = ProjectInfoForm.getEntityByForm(form, null);
Long userId = SecurityUtils.getUserId();
entity.setCreateBy(userId);
entity.setUpdateBy(userId);
+ //濡傛灉鏄偍澶囬」鐩�(鏈紑宸ラ」鐩�)涓嶉渶瑕佸鏍�
+ if (ProjectConstant.COMMIT.equals(entity.getUsedStatus()) && ProjectStatusEnum.PENDDING.getType().equals(entity.getProjectStatus())) {
+ entity.setUsedStatus(ProjectConstant.PASS);
+ }
+ if(!checkProjectNameAndIdIsUnique(entity,null)){
+ throw new RuntimeException("椤圭洰閲嶅锛岄」鐩悕绉般�侀」鐩爜宸插瓨鍦�");
+ }
baseMapper.insert(entity);
addPlan(entity.getId()); //娣诲姞璁″垝琛�
- //娣诲姞鏂囦欢
- List<File> fileList = form.getFileList();
- fileList.forEach(item -> {
- item.setBusId(entity.getId());
- item.setType(FileTypeEnum.PROJECT_INFO);
- });
- fileService.saveBatch(fileList);
+ //娣诲姞椤圭洰涓爣鍗曚綅
+ List<ProjectInfoWinUnit> projectInfoWinUnits = new ArrayList<>();
+ for (ProjectInfoWinUnitForm winUnitForm : form.getWinUnitList()) {
+ ProjectInfoWinUnit projectInfoWinUnit = ProjectInfoWinUnitForm.getEntityByForm(winUnitForm, null);
+ projectInfoWinUnit.setId(null);
+ projectInfoWinUnit.setProjectInfoId(entity.getId());
+ projectInfoWinUnits.add(projectInfoWinUnit);
+ }
+ if (!CollectionUtils.isEmpty(projectInfoWinUnits)) {
+ projectInfoWinUnitService.saveBatch(projectInfoWinUnits);
+ }
+ //娣诲姞骞村害鎶曡祫璁″垝
+ List<ProjectInfoYearPlan> projectInfoYearPlans = new ArrayList<>();
+ for (ProjectInfoYearPlanForm yearPlanForm : form.getYearPlanList()) {
+ ProjectInfoYearPlan yearPlan = ProjectInfoYearPlanForm.getEntityByForm(yearPlanForm, null);
+ yearPlan.setId(null);
+ yearPlan.setProjectInfoId(entity.getId());
+ projectInfoYearPlans.add(yearPlan);
+ }
+ if (!CollectionUtils.isEmpty(projectInfoYearPlans)) {
+ projectInfoYearPlanService.saveBatch(projectInfoYearPlans);
+ }
return Result.ok("娣诲姞鎴愬姛").data(entity.getId());
+ }
+
+ /**
+ * 鍒ゆ柇椤圭洰鍚嶅拰椤圭洰鐮佹槸鍚﹀敮涓�
+ * @param entity from true 鏉ヨ嚜add() false 鏉ヨ嚜edit()
+ * @return
+ */
+ public boolean checkProjectNameAndIdIsUnique(ProjectInfo entity,Long updateId){
+ LambdaQueryWrapper<ProjectInfo> queryWrapper = new LambdaQueryWrapper<>();
+ if (updateId == null) {
+ 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();
+ }
+
}
public void addPlan(Long projectInfoId) {
@@ -128,30 +190,87 @@
* @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 (SecurityUtils.isAdmin(SecurityUtils.getUserId())) {
+ entity.setUsedStatus(ProjectConstant.PASS);
+ }
+ if(!checkProjectNameAndIdIsUnique(entity,form.getId())){
+ throw new RuntimeException("椤圭洰閲嶅锛岄」鐩悕绉般�侀」鐩爜宸插瓨鍦�");
+ }
//鏇存柊椤圭洰淇℃伅
baseMapper.updateById(entity);
- List<File> fileList = form.getFileList();
- fileList.forEach(item -> {
- item.setId(null);
- item.setBusId(entity.getId());
- item.setType(FileTypeEnum.PROJECT_INFO);
- });
- //鍒犻櫎鍘熸湁鏂囦欢
- QueryWrapper<File> fileQueryWrapper = new QueryWrapper<>();
- fileQueryWrapper.eq("type", FileTypeEnum.PROJECT_INFO.getType());
- fileQueryWrapper.eq("bus_id", entity.getId());
- fileMapper.delete(fileQueryWrapper);
- //鏇挎崲鎴愮幇鏈�
- fileService.saveBatch(fileList);
+ //淇敼椤圭洰涓爣鍗曚綅
+ //鍒犻櫎鍘熸暟鎹�
+ new LambdaUpdateChainWrapper<>(projectInfoWinUnitService.getBaseMapper())
+ .eq(ProjectInfoWinUnit::getProjectInfoId, entity.getId())
+ .remove();
+ //娣诲姞椤圭洰涓爣鍗曚綅
+ List<ProjectInfoWinUnit> projectInfoWinUnits = new ArrayList<>();
+ for (ProjectInfoWinUnitForm winUnitForm : form.getWinUnitList()) {
+ ProjectInfoWinUnit projectInfoWinUnit = ProjectInfoWinUnitForm.getEntityByForm(winUnitForm, null);
+ projectInfoWinUnit.setId(null);
+ projectInfoWinUnit.setProjectInfoId(entity.getId());
+ projectInfoWinUnits.add(projectInfoWinUnit);
+ }
+ if (!CollectionUtils.isEmpty(projectInfoWinUnits)) {
+ projectInfoWinUnitService.saveBatch(projectInfoWinUnits);
+ }
+
+ //淇敼骞村害鎶曡祫璁″垝
+ //鍒犻櫎鍘熸暟鎹�
+ new LambdaUpdateChainWrapper<>(projectInfoYearPlanService.getBaseMapper())
+ .eq(ProjectInfoYearPlan::getProjectInfoId, entity.getId())
+ .remove();
+ //娣诲姞骞村害鎶曡祫璁″垝
+ List<ProjectInfoYearPlan> projectInfoYearPlans = new ArrayList<>();
+ for (ProjectInfoYearPlanForm yearPlanForm : form.getYearPlanList()) {
+ ProjectInfoYearPlan yearPlan = ProjectInfoYearPlanForm.getEntityByForm(yearPlanForm, null);
+ yearPlan.setId(null);
+ yearPlan.setProjectInfoId(entity.getId());
+ projectInfoYearPlans.add(yearPlan);
+ }
+ if (!CollectionUtils.isEmpty(projectInfoYearPlans)) {
+ projectInfoYearPlanService.saveBatch(projectInfoYearPlans);
+ }
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);
+ }
}
/**
@@ -179,6 +298,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());
@@ -190,7 +311,7 @@
}
/**
- * 鍒嗛〉鏌ヨ
+ * 鍒嗛〉鏌ヨ锛孴ODO 椤圭洰涓績鐨勫垎椤典娇鐢ㄥ崟鐙殑鎺ュ彛锛屽幓鎺夊啓姝荤殑閫昏緫鎹㈡垚dept or鏌ヨ
*
* @param query
* @return
@@ -203,37 +324,50 @@
if (query.getProjectEndTime() != null) {
query.setProjectEndTime(DateUtils.getDayEnd(query.getProjectEndTime()));
}
- String projectCategory = query.getProjectCategory();
- //瀹炴柦闃舵鏈変袱涓�兼斁鍦╯ql澶勭悊
- if (ProjectCategoryEnum.RESERVE.getType().equals(projectCategory)) {
- query.setProjectStatus(ProjectCategoryEnum.RESERVE.getStatus());
- query.setReserveOrPrevious(ProjectCategoryEnum.RESERVE.getCode());
- } else if (ProjectCategoryEnum.PREVIOUS.getType().equals(projectCategory)) {
- query.setProjectStatus(ProjectCategoryEnum.PREVIOUS.getStatus());
- query.setReserveOrPrevious(ProjectCategoryEnum.PREVIOUS.getCode());
- } else if (ProjectCategoryEnum.FINISH.getType().equals(projectCategory)) {
- query.setProjectStatus(ProjectCategoryEnum.FINISH.getStatus());
- } else if (ProjectCategoryEnum.EXCEPTION.getType().equals(projectCategory)) {
- //TODO
- //鍏堟煡鍑哄紓甯告祦绋嬫垨鑰呭紓甯歌繘搴︽垨鑰呭紓甯歌鍒掔殑projectId鍜屽紓甯哥绫�
- //閫氳繃projectId鏌ュ嚭椤圭洰鏁版嵁
- //琛ュ厖鐩稿簲鐨勫紓甯告暟鎹紙寮傚父绉嶇被銆佸紓甯告祦绋嬭妭鐐圭瓑锛�
- List<ProjectVO> list = new ArrayList<>();
- return Result.ok().data(list).total(0);
+ 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);
+ }
+ Long userId = SecurityUtils.getUserId();
+ 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")) {
+ query.setProjectOwnerUnit(SecurityUtils.getDeptId());
+ //涓氫富
+ query.setRole(0);
+ } else if ((!CollectionUtils.isEmpty(ancestorList) && ancestorList.contains("102"))) {
+ query.setCompetentDepartment(SecurityUtils.getDeptId());
+ //瀹℃壒 瀵瑰簲涓荤閮ㄩ棬
+ query.setRole(1);
+ } else if (SecurityUtils.isAdmin(userId)) {
+ query.setRole(3);
}
IPage<ProjectInfoVO> page = PageUtil.getPage(query, ProjectInfoVO.class);
- baseMapper.getPage(page, query);
+ baseMapper.getPage(query, page);
List<ProjectInfoVO> records = page.getRecords();
List<ProjectVO> list = new ArrayList<>();
records.forEach(vo -> {
ProjectInfoVO.transform(vo);
- vo.setProjectColorCode("green");
ProjectVO projectVO = new ProjectVO();
copyToProjectVO(vo, projectVO);
- //缈昏瘧椤圭洰闃舵
- String phase = ProjectCategoryEnum.getPhaseByProjectStatus(projectVO.getProjectStatus(), projectVO.getProcessId() != null);
+ 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);
+ 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());
@@ -263,11 +397,30 @@
ProjectInfo entity = baseMapper.getById(id);
Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
ProjectInfoVO vo = ProjectInfoVO.getVoByEntity(entity, null);
+ 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());
- 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);
}
@@ -295,7 +448,7 @@
// {"type":"鐪侀噸鐐归」鐩�","count":0,"amount":"0.00","text":"鐪�"}]}}
IndexCountVO indexCountVO = new IndexCountVO();
List<IndexProPhaseCountVO> proPhaseCountVO = new ArrayList<>();
- List<ProjectVO> projectVOS = baseMapper.homeCount();
+ List<ProjectVO> projectVOS = baseMapper.homeCount(new BaseEntity());
List<ProjectVO> reserve = new ArrayList<>();
List<ProjectVO> previous = new ArrayList<>();
List<ProjectVO> implement = new ArrayList<>();
@@ -305,72 +458,78 @@
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);
+ }
}
});
//鍗曚綅鍏堥粯璁や负鍏�
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);
List<IndexImpTypeCountVO> impTypeCountVO = new ArrayList<>();
- impTypeCountVO.add(new IndexImpTypeCountVO("涓�鑸」鐩�", province.size(), province.stream().
+ 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("鍘块噸鐐归」鐩�", city.size(), city.stream().
+ 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("甯傞噸鐐归」鐩�", county.size(), county.stream().
+ 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("鐪侀噸鐐归」鐩�", normal.size(), normal.stream().
+ 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;
}
@@ -415,7 +574,7 @@
ProjectInfo projectInfo = baseMapper.selectById(recordId);
// 鍒ゆ柇褰撳墠鐢ㄦ埛id鏄惁鍦ㄤ富绠″垪琛ㄤ腑
String competentDepartment = projectInfo.getCompetentDepartment();
- if (StringUtils.isEmpty(competentDepartment)){
+ if (StringUtils.isEmpty(competentDepartment)) {
return Result.ok().data(false);
}
List<String> list = Arrays.asList(competentDepartment.split(","));
@@ -437,7 +596,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);
@@ -565,12 +724,18 @@
java.io.File tempDir = null;
try {
tempZip = java.io.File.createTempFile("temp", ".zip");
- try(InputStream inputStream = file.getInputStream()) {
+ try (InputStream inputStream = file.getInputStream()) {
Files.copy(inputStream, tempZip.toPath(), StandardCopyOption.REPLACE_EXISTING);
}
tempDir = Files.createTempDirectory("temp-dir").toFile();
- ZipUtil.unzip(tempZip, tempDir, StandardCharsets.ISO_8859_1);
+
+ try {
+ ZipUtil.unzip(tempZip, tempDir, CharsetUtil.CHARSET_UTF_8);
+ } catch (IORuntimeException e) {
+ log.error("瑙ｅ帇澶辫触锛屽皾璇曚娇鐢℅BK缂栫爜瑙ｅ帇...");
+ ZipUtil.unzip(tempZip, tempDir, CharsetUtil.CHARSET_GBK);
+ }
Path path = tempDir.toPath();
ProjectImportListener projectImportListener = new ProjectImportListener();
@@ -609,7 +774,7 @@
files.forEach(attachmentFile -> {
try {
//涓婁紶
- String url = FileUploadUtils.upload(filePath, file);
+ String url = FileUploadUtils.uploadIOFile(filePath, attachmentFile);
//瀛樻斁鐨勬枃浠跺悕浼氬姞涓奯鏃堕棿鎴崇殑鍚庣紑
String newName = FileUtils.getName(url);
attachments.add(new File()
@@ -650,6 +815,142 @@
}
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Result editProject(ProjectForm form) {
+ Long projectId = form.getProjectInfoForm().getId();
+ if (ObjectUtil.isNotNull(form.getProjectInfoForm())) {
+ if (ObjectUtil.isNull(form.getProjectInfoForm().getId())) {
+ //鏂板
+ ProjectInfo entity = ProjectInfoForm.getEntityByForm(form.getProjectInfoForm(), null);
+ Long userId = SecurityUtils.getUserId();
+ entity.setCreateBy(userId);
+ entity.setUpdateBy(userId);
+ //濡傛灉鏄偍澶囬」鐩�(鏈紑宸ラ」鐩�)涓嶉渶瑕佸鏍�
+ if (ProjectCategoryEnum.RESERVE.getType().equals(entity.getProjectPhase())) {
+ entity.setUsedStatus(ProjectConstant.PASS);
+ }
+ // 绠＄悊鍛樹慨鏀圭殑鐩存帴閫氳繃
+ if (SecurityUtils.isAdmin(SecurityUtils.getUserId())) {
+ entity.setUsedStatus(ProjectConstant.PASS);
+ }
+ if(!checkProjectNameAndIdIsUnique(entity,null)){
+ throw new RuntimeException("椤圭洰閲嶅锛岄」鐩悕绉般�侀」鐩爜宸插瓨鍦�");
+ }
+ baseMapper.insert(entity);
+ projectId = entity.getId();
+ addPlan(entity.getId()); //娣诲姞璁″垝琛�
+ //娣诲姞椤圭洰涓爣鍗曚綅
+ List<ProjectInfoWinUnit> projectInfoWinUnits = new ArrayList<>();
+ for (ProjectInfoWinUnitForm winUnitForm : form.getProjectInfoForm().getWinUnitList()) {
+ ProjectInfoWinUnit projectInfoWinUnit = ProjectInfoWinUnitForm.getEntityByForm(winUnitForm, null);
+ projectInfoWinUnit.setId(null);
+ projectInfoWinUnit.setProjectInfoId(entity.getId());
+ projectInfoWinUnits.add(projectInfoWinUnit);
+ }
+ if (!CollectionUtils.isEmpty(projectInfoWinUnits)) {
+ projectInfoWinUnitService.saveBatch(projectInfoWinUnits);
+ }
+ //娣诲姞骞村害鎶曡祫璁″垝
+ List<ProjectInfoYearPlan> projectInfoYearPlans = new ArrayList<>();
+ for (ProjectInfoYearPlanForm yearPlanForm : form.getProjectInfoForm().getYearPlanList()) {
+ ProjectInfoYearPlan yearPlan = ProjectInfoYearPlanForm.getEntityByForm(yearPlanForm, null);
+ yearPlan.setId(null);
+ yearPlan.setProjectInfoId(entity.getId());
+ projectInfoYearPlans.add(yearPlan);
+ }
+ if (!CollectionUtils.isEmpty(projectInfoYearPlans)) {
+ projectInfoYearPlanService.saveBatch(projectInfoYearPlans);
+ }
+ } else {
+ //鏇存柊
+ ProjectInfo entity = baseMapper.selectById(form.getProjectInfoForm().getId());
+
+ // 涓虹┖鎶汭llegalArgumentException锛屽仛鍏ㄥ眬寮傚父澶勭悊
+ Assert.notNull(entity, "璁板綍涓嶅瓨鍦�");
+ ProjectInfoForm.getEntityByForm(form.getProjectInfoForm(), entity);
+ Long userId = SecurityUtils.getUserId();
+ entity.setUpdateBy(userId);
+ //濡傛灉鏄偍澶囬」鐩�(鏈紑宸ラ」鐩�)涓嶉渶瑕佸鏍�
+ if (ProjectCategoryEnum.RESERVE.getType().equals(entity.getProjectPhase())) {
+ entity.setUsedStatus(ProjectConstant.PASS);
+ }
+ // 绠＄悊鍛樹慨鏀圭殑鐩存帴閫氳繃
+ if (SecurityUtils.isAdmin(SecurityUtils.getUserId())) {
+ entity.setUsedStatus(ProjectConstant.PASS);
+ }
+ if(!checkProjectNameAndIdIsUnique(entity, entity.getId())){
+ throw new RuntimeException("椤圭洰閲嶅锛岄」鐩悕绉般�侀」鐩爜宸插瓨鍦�");
+ }
+ //鏇存柊椤圭洰淇℃伅
+ baseMapper.updateById(entity);
+ //淇敼椤圭洰涓爣鍗曚綅
+ //鍒犻櫎鍘熸暟鎹�
+ new LambdaUpdateChainWrapper<>(projectInfoWinUnitService.getBaseMapper())
+ .eq(ProjectInfoWinUnit::getProjectInfoId, entity.getId())
+ .remove();
+ //娣诲姞椤圭洰涓爣鍗曚綅
+ List<ProjectInfoWinUnit> projectInfoWinUnits = new ArrayList<>();
+ for (ProjectInfoWinUnitForm winUnitForm : form.getProjectInfoForm().getWinUnitList()) {
+ ProjectInfoWinUnit projectInfoWinUnit = ProjectInfoWinUnitForm.getEntityByForm(winUnitForm, null);
+ projectInfoWinUnit.setId(null);
+ projectInfoWinUnit.setProjectInfoId(entity.getId());
+ projectInfoWinUnits.add(projectInfoWinUnit);
+ }
+ if (!CollectionUtils.isEmpty(projectInfoWinUnits)) {
+ projectInfoWinUnitService.saveBatch(projectInfoWinUnits);
+ }
+
+ //淇敼骞村害鎶曡祫璁″垝
+ //鍒犻櫎鍘熸暟鎹�
+ new LambdaUpdateChainWrapper<>(projectInfoYearPlanService.getBaseMapper())
+ .eq(ProjectInfoYearPlan::getProjectInfoId, entity.getId())
+ .remove();
+ //娣诲姞骞村害鎶曡祫璁″垝
+ List<ProjectInfoYearPlan> projectInfoYearPlans = new ArrayList<>();
+ for (ProjectInfoYearPlanForm yearPlanForm : form.getProjectInfoForm().getYearPlanList()) {
+ ProjectInfoYearPlan yearPlan = ProjectInfoYearPlanForm.getEntityByForm(yearPlanForm, null);
+ yearPlan.setId(null);
+ yearPlan.setProjectInfoId(entity.getId());
+ projectInfoYearPlans.add(yearPlan);
+ }
+ if (!CollectionUtils.isEmpty(projectInfoYearPlans)) {
+ projectInfoYearPlanService.saveBatch(projectInfoYearPlans);
+ }
+ }
+
+ // 鏇存柊鍏跺畠椤圭洰淇℃伅琛�
+ 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.getProjectUnitRegistrationInfoForm())) {
+ if (Objects.nonNull(form.getProjectUnitRegistrationInfoForm().getId())) {
+ projectUnitRegistrationInfoServiceImpl.update(form.getProjectUnitRegistrationInfoForm());
+ } else {
+ form.getProjectUnitRegistrationInfoForm().setProjectId(projectId);
+ projectUnitRegistrationInfoServiceImpl.add(form.getProjectUnitRegistrationInfoForm());
+ }
+
+ }
+ }
+ return Result.ok("淇濆瓨鎴愬姛");
+ }
+
+ @Override
+ public Result searchByKey(String wordKey) {
+ Wrapper wrapper = null;
+ if (!StringUtils.isEmpty(wordKey)) {
+ wrapper = Wrappers.<ProjectInfo>lambdaQuery().like(ProjectInfo::getProjectName, wordKey).or().like(ProjectInfo::getProjectCode, wordKey);
+ }
+ List<ProjectInfo> list = baseMapper.selectList(wrapper);
+ return Result.ok().data(list);
+ }
+
private static void deleteDirectoryOrFile(java.io.File file) {
if (ObjectUtil.isNull(file)) {
return;
@@ -665,8 +966,10 @@
}
file.delete();
}
+
/**
* 椤圭洰鍚嶇О鏍￠獙閲嶅
+ *
* @return
*/
public void checkProjectNameUnique(ProjectInfo projectInfo) {
--
Gitblit v1.8.0