From f73dbcd6c21d28ab1e98840eee73c6d09bd0f929 Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Tue, 27 Aug 2024 17:31:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectPersonConfigServiceImpl.java | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectPersonConfigServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectPersonConfigServiceImpl.java
index 0e404b2..21569e7 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectPersonConfigServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectPersonConfigServiceImpl.java
@@ -3,11 +3,14 @@
import cn.gistack.sm.sg.DO.SgProgressReportDO;
import cn.gistack.sm.sg.DO.SgProjectPersonConfigDO;
import cn.gistack.sm.sg.DO.SgProjectRolePersonV0;
+import cn.gistack.sm.sg.DO.SgReportUserDO;
import cn.gistack.sm.sg.DTO.AddSgProjectPersonConfigDTO;
import cn.gistack.sm.sg.DTO.ProjectSearchDTO;
import cn.gistack.sm.sg.mapper.SgProgressReportMapper;
import cn.gistack.sm.sg.mapper.SgProjectPersonConfigMapper;
+import cn.gistack.sm.sg.mapper.SgReportUserMapper;
import cn.gistack.sm.sg.service.SgProjectPersonConfigService;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -33,6 +36,9 @@
private SgProjectPersonConfigMapper projectPersonConfigMapper;
@Autowired
private SgProgressReportMapper sgProgressReportMapper;
+
+ @Autowired
+ private SgReportUserMapper sgReportUserMapper;
@Override
public List<String> getRoleList(ProjectSearchDTO searchDTO) {
List<String> list = projectPersonConfigMapper.getRoleList(searchDTO);
@@ -48,17 +54,26 @@
projectPersonConfigMapper.insert(sgProjectPersonConfigDO);
}else {
SgProjectPersonConfigDO old = projectPersonConfigMapper.selectById(id);
- boolean isReport = !new LambdaQueryChainWrapper<>(sgProgressReportMapper).eq(SgProgressReportDO::getProframId, old.getProgramId()).list().isEmpty();
+ List<SgReportUserDO> reportUserDOS = sgProgressReportMapper.selectProcessUserByProjectId(old.getProgramId());
if (Objects.isNull(userId)){
- if (isReport){
- throw new ServiceException("此项目配置存在审批，不允许修改");
- }
projectPersonConfigMapper.deleteById(id);
- }else if (!old.getUserId().equals(sgProjectPersonConfigDO.getUserId())){
- if (isReport){
- throw new ServiceException("此项目配置存在审批，不允许修改");
+ if (!CollectionUtils.isEmpty(reportUserDOS)){
+ reportUserDOS.forEach(s->{
+ if (Objects.equals(old.getUserId(), s.getUserId())){
+// sgReportUserMapper.deleteById(s.getId());
+ }
+ });
}
+ }else if (!old.getUserId().equals(sgProjectPersonConfigDO.getUserId())){
projectPersonConfigMapper.updateById(sgProjectPersonConfigDO);
+ if (!CollectionUtils.isEmpty(reportUserDOS)){
+ reportUserDOS.forEach(s->{
+ if (Objects.equals(old.getUserId(), s.getUserId())){
+ s.setUserId(sgProjectPersonConfigDO.getUserId());
+ sgReportUserMapper.updateById(s);
+ }
+ });
+ }
}
}
}
--
Gitblit v1.9.3