From 23b688e436a89845e92d861adb5875e625e90d9f Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期五, 14 三月 2025 11:43:18 +0800
Subject: [PATCH] Merge branch 'dev'
---
business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java | 361 ++++++++++++++++++++++++++++++++-------------------
1 files changed, 226 insertions(+), 135 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 611867a..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,15 +7,19 @@
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;
@@ -65,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;
@@ -108,8 +113,6 @@
//娣诲姞鍩烘湰淇℃伅
ProjectInfo entity = ProjectInfoForm.getEntityByForm(form, null);
Long userId = SecurityUtils.getUserId();
-// Long deptId = SecurityUtils.getDeptId();
-// entity.setProjectOwnerUnit(deptId);
entity.setCreateBy(userId);
entity.setUpdateBy(userId);
//濡傛灉鏄偍澶囬」鐩�(鏈紑宸ラ」鐩�)涓嶉渶瑕佸鏍�
@@ -121,18 +124,28 @@
}
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);
-
//娣诲姞椤圭洰涓爣鍗曚綅
- saveUnit(entity.getId(), form.getWinUnitList());
+ 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);
+ }
//娣诲姞骞村害鎶曡祫璁″垝
- saveYearPlan(entity.getId(), form.getYearPlanList());
+ 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());
}
@@ -142,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());
-
- 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();
}
}
@@ -193,40 +203,48 @@
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);
-
//淇敼椤圭洰涓爣鍗曚綅
//鍒犻櫎鍘熸暟鎹�
- QueryWrapper<ProjectInfoWinUnit> unitWrapper = new QueryWrapper<>();
- unitWrapper.eq("project_info_id", form.getId());
- projectInfoWinUnitService.remove(unitWrapper);
+ new LambdaUpdateChainWrapper<>(projectInfoWinUnitService.getBaseMapper())
+ .eq(ProjectInfoWinUnit::getProjectInfoId, entity.getId())
+ .remove();
//娣诲姞椤圭洰涓爣鍗曚綅
- saveUnit(entity.getId(), form.getWinUnitList());
+ 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);
+ }
//淇敼骞村害鎶曡祫璁″垝
//鍒犻櫎鍘熸暟鎹�
- QueryWrapper<ProjectInfoYearPlan> yearPlanWrapper = new QueryWrapper<>();
- unitWrapper.eq("project_info_id", form.getId());
- projectInfoYearPlanService.remove(yearPlanWrapper);
+ new LambdaUpdateChainWrapper<>(projectInfoYearPlanService.getBaseMapper())
+ .eq(ProjectInfoYearPlan::getProjectInfoId, entity.getId())
+ .remove();
//娣诲姞骞村害鎶曡祫璁″垝
- saveYearPlan(entity.getId(), form.getYearPlanList());
+ 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("淇敼鎴愬姛");
}
@@ -307,25 +325,13 @@
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(",");
@@ -335,24 +341,27 @@
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);
+ } else if (SecurityUtils.isAdmin(userId)) {
+ query.setRole(3);
}
IPage<ProjectInfoVO> page = PageUtil.getPage(query, ProjectInfoVO.class);
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())) {
// 缈昏瘧椤圭洰瀛愮被鍨�
@@ -360,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);
});
@@ -390,14 +407,11 @@
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());
-
- List<File> files = fileMapper.selectList(fileQueryWrapper);
- vo.setFileList(files);
//涓爣鍗曚綅
List<ProjectInfoWinUnitVO> unitVOS = new ArrayList<>();
@@ -454,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);
+ }
}
});
//鍗曚綅鍏堥粯璁や负鍏�
@@ -585,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);
@@ -807,57 +828,127 @@
@Override
@Transactional(rollbackFor = Exception.class)
public Result editProject(ProjectForm form) {
- Long projectId = null;
+ Long projectId = form.getProjectInfoForm().getId();
if (ObjectUtil.isNotNull(form.getProjectInfoForm())) {
if (ObjectUtil.isNull(form.getProjectInfoForm().getId())) {
//鏂板
- projectId = (Long) ((ProjectInfoServiceImpl) AopContext.currentProxy()).add(form.getProjectInfoForm()).get("data");
+ 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 {
//鏇存柊
- ((ProjectInfoServiceImpl) AopContext.currentProxy()).update(form.getProjectInfoForm());
- }
- }
- if (ObjectUtil.isNotNull(form.getProjectInvestmentInfoForm())) {
- if (ObjectUtil.isNull(form.getProjectInvestmentInfoForm().getId())) {
- form.getProjectInvestmentInfoForm().setProjectId(projectId);
- projectInvestmentInfoServiceImpl.add(form.getProjectInvestmentInfoForm());
- } else {
- projectInvestmentInfoServiceImpl.update(form.getProjectInvestmentInfoForm());
- }
- }
- if (ObjectUtil.isNotNull(form.getProjectInvestmentFundingForm())) {
- if (ObjectUtil.isNull(form.getProjectInvestmentFundingForm().getId())) {
- form.getProjectInvestmentFundingForm().setProjectId(projectId);
- projectInvestmentFundingServiceImpl.add(form.getProjectInvestmentFundingForm());
- } else {
- projectInvestmentFundingServiceImpl.update(form.getProjectInvestmentFundingForm());
- }
- }
- if (ObjectUtil.isNotNull(form.getProjectInvestmentPolicyComplianceForm())) {
- if (ObjectUtil.isNull(form.getProjectInvestmentPolicyComplianceForm().getId())) {
- form.getProjectInvestmentPolicyComplianceForm().setProjectId(projectId);
- projectInvestmentPolicyComplianceServiceImpl.add(form.getProjectInvestmentPolicyComplianceForm());
- } else {
- projectInvestmentPolicyComplianceServiceImpl.update(form.getProjectInvestmentPolicyComplianceForm());
- }
- }
- if (ObjectUtil.isNotNull(form.getProjectUnitRegistrationInfoForm())) {
- if (ObjectUtil.isNull(form.getProjectUnitRegistrationInfoForm().getId())) {
- form.getProjectUnitRegistrationInfoForm().setProjectId(projectId);
- projectUnitRegistrationInfoServiceImpl.add(form.getProjectUnitRegistrationInfoForm());
- } else {
- projectUnitRegistrationInfoServiceImpl.update(form.getProjectUnitRegistrationInfoForm());
- }
- }
- if (ObjectUtil.isNotNull(form.getDocumentInfoForm())) {
- if (ObjectUtil.isNull(form.getDocumentInfoForm().getProjectId())) {
- return Result.error("璇峰厛淇濆瓨鎶曡祫绠＄悊鍩烘湰淇℃伅");
- } else {
- addDoc(form.getDocumentInfoForm());
- }
- }
+ ProjectInfo entity = baseMapper.selectById(form.getProjectInfoForm().getId());
- return Result.ok("鎻愪氦鎴愬姛");
+ // 涓虹┖鎶汭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
--
Gitblit v1.8.0