From 8d2f2f78c0c02205b91946f4f5cfdc03bcb3383a Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 10 四月 2025 16:25:21 +0800
Subject: [PATCH] 项目法人单位保存bug
---
business/src/main/java/com/ycl/service/impl/ProjectInfoServiceImpl.java | 59 ++++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 42 insertions(+), 17 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 4f24ca5..e8527bd 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;
@@ -19,10 +20,7 @@
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.enums.business.*;
import com.ycl.common.exception.base.BaseException;
import com.ycl.common.utils.CopyUtils;
import com.ycl.common.utils.DateUtils;
@@ -68,6 +66,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;
@@ -98,6 +97,7 @@
private final ProjectUnitRegistrationInfoServiceImpl projectUnitRegistrationInfoServiceImpl;
private final SysDeptMapper sysDeptMapper;
private final ISysDictDataService dictDataService;
+ private final ProcessLogService processLogService;
/**
@@ -153,7 +153,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())
@@ -351,12 +351,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);
@@ -366,6 +367,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);
});
@@ -396,8 +405,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());
@@ -536,6 +545,12 @@
public Map<String, Integer> countExceptionProject(IndexDTO indexDTO) {
Map<String, Integer> map = new HashMap<>();
map.put("processExceptionProject", 0);
+ // 鏌ヨ鍙戠敓杩囧缂虹殑椤圭洰鏁�
+ List<String> projectIds = new LambdaQueryChainWrapper<>(processLogService.getBaseMapper())
+ .select(ProcessLog::getProjectId)
+ .eq(ProcessLog::getEventType, ProcessLogEventTypeEnum.WAIT)
+ .list().stream().map(ProcessLog::getProjectId).distinct().collect(Collectors.toList());
+ map.put("hasWaitProjectNum", projectIds.size());
return map;
}
@@ -817,6 +832,12 @@
@Override
@Transactional(rollbackFor = Exception.class)
public Result editProject(ProjectForm form) {
+ // 鑽夌鐨勬儏鍐碉紝闇�瑕佸垽瀹氭湁娌℃湁閫変笟涓诲崟浣�(鍥犱负鑽夌涓嶆牎楠屽繀濉�)锛屾病閫夊垯榛樿璁剧疆涓哄綋鍓嶄汉鐨勫崟浣�
+ if (ProjectConstant.DRAFT.equals(form.getProjectInfoForm().getUsedStatus())) {
+ if (Objects.isNull(form.getProjectInfoForm().getProjectOwnerUnit())) {
+ form.getProjectInfoForm().setProjectOwnerUnit(SecurityUtils.getDeptId());
+ }
+ }
Long projectId = form.getProjectInfoForm().getId();
if (ObjectUtil.isNotNull(form.getProjectInfoForm())) {
if (ObjectUtil.isNull(form.getProjectInfoForm().getId())) {
@@ -825,12 +846,12 @@
Long userId = SecurityUtils.getUserId();
entity.setCreateBy(userId);
entity.setUpdateBy(userId);
- //濡傛灉鏄偍澶囬」鐩�(鏈紑宸ラ」鐩�)涓嶉渶瑕佸鏍�
- if (ProjectCategoryEnum.RESERVE.getType().equals(entity.getProjectPhase())) {
+ //濡傛灉鏄偍澶囬」鐩�(鏈紑宸ラ」鐩�)涓嶉渶瑕佸鏍革紙鑽夌闄ゅ锛�
+ if (ProjectCategoryEnum.RESERVE.getType().equals(entity.getProjectPhase()) && ! ProjectConstant.DRAFT.equals(entity.getUsedStatus())) {
entity.setUsedStatus(ProjectConstant.PASS);
}
- // 绠＄悊鍛樹慨鏀圭殑鐩存帴閫氳繃
- if (SecurityUtils.isAdmin(SecurityUtils.getUserId())) {
+ // 绠＄悊鍛樹慨鏀圭殑鐩存帴閫氳繃(绠＄悊鍛樹繚瀛樹负鑽夌锛岄偅涔堢姸鎬佽繕鏄崏绋�)
+ if (SecurityUtils.isAdmin(SecurityUtils.getUserId()) && ! ProjectConstant.DRAFT.equals(entity.getUsedStatus())) {
entity.setUsedStatus(ProjectConstant.PASS);
}
if(!checkProjectNameAndIdIsUnique(entity,null)){
@@ -870,12 +891,12 @@
ProjectInfoForm.getEntityByForm(form.getProjectInfoForm(), entity);
Long userId = SecurityUtils.getUserId();
entity.setUpdateBy(userId);
- //濡傛灉鏄偍澶囬」鐩�(鏈紑宸ラ」鐩�)涓嶉渶瑕佸鏍�
- if (ProjectCategoryEnum.RESERVE.getType().equals(entity.getProjectPhase())) {
+ //濡傛灉鏄偍澶囬」鐩�(鏈紑宸ラ」鐩�)涓嶉渶瑕佸鏍革紙鑽夌闄ゅ锛�
+ if (ProjectCategoryEnum.RESERVE.getType().equals(entity.getProjectPhase()) && ! ProjectConstant.DRAFT.equals(entity.getUsedStatus())) {
entity.setUsedStatus(ProjectConstant.PASS);
}
- // 绠＄悊鍛樹慨鏀圭殑鐩存帴閫氳繃
- if (SecurityUtils.isAdmin(SecurityUtils.getUserId())) {
+ // 绠＄悊鍛樹慨鏀圭殑鐩存帴閫氳繃(绠＄悊鍛樹繚瀛樹负鑽夌锛岄偅涔堢姸鎬佽繕鏄崏绋�)
+ if (SecurityUtils.isAdmin(SecurityUtils.getUserId()) && ! ProjectConstant.DRAFT.equals(entity.getUsedStatus())) {
entity.setUsedStatus(ProjectConstant.PASS);
}
if(!checkProjectNameAndIdIsUnique(entity, entity.getId())){
@@ -931,6 +952,10 @@
if (Objects.nonNull(form.getProjectUnitRegistrationInfoForm().getId())) {
projectUnitRegistrationInfoServiceImpl.update(form.getProjectUnitRegistrationInfoForm());
} else {
+ // 鍏堝垹鎺変箣鍓嶇殑锛屽啀鏂板
+ new LambdaUpdateChainWrapper<>(projectUnitRegistrationInfoServiceImpl.getBaseMapper())
+ .eq(ProjectUnitRegistrationInfo::getProjectId, projectId)
+ .remove();
form.getProjectUnitRegistrationInfoForm().setProjectId(projectId);
projectUnitRegistrationInfoServiceImpl.add(form.getProjectUnitRegistrationInfoForm());
}
--
Gitblit v1.8.0