From 011a3316c239711594d08b01491ad1550d3139c7 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 2 Feb 2024 19:16:10 +0800 Subject: [PATCH] =?UTF-8?q?fix=2081689=20=E6=B3=95=E8=A7=84=E5=B7=A5?= =?UTF-8?q?=E7=A8=8B=E5=B8=88=E9=A9=B3=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/ProcessProjectStandardCommon.java | 2 + .../ProcessProjectStandardTermUser.java | 6 +++ .../ProcessProjectStandardTermMapper.java | 2 +- .../xml/ProcessProjectStandardTermMapper.xml | 8 +++- .../ProcessProjectStandardService.java | 47 +++++++++++++++---- 5 files changed, 54 insertions(+), 11 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/common/ProcessProjectStandardCommon.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/common/ProcessProjectStandardCommon.java index 59e31d52..adb838fa 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/common/ProcessProjectStandardCommon.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/common/ProcessProjectStandardCommon.java @@ -49,6 +49,8 @@ public class ProcessProjectStandardCommon { //部所主管级领导审批 public static final String BSZGJLDSP_ = "bszgjldsp_"; public static final String BSZGJLDSP_1 = "bszgjldsp_1"; + public static final String BSZGJLDSP_2 = "bszgjldsp_2"; + public static final String BSZGJLDSP_3 = "bszgjldsp_3"; //法规工程师审批 public static final String FGGCSSP = "fggcssp"; //设计工程师补充工作令编号 diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTermUser.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTermUser.java index 43881d3c..d820d512 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTermUser.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/entity/ProcessProjectStandardTermUser.java @@ -79,6 +79,12 @@ public class ProcessProjectStandardTermUser { @ApiModelProperty(value="评估流程id") private String processId; + /** + * 部所级领导父执行id + */ + @ApiModelProperty(value="部所级领导父执行id") + private String leaderParentExecutionId; + /** * 关联条款表id */ diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/ProcessProjectStandardTermMapper.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/ProcessProjectStandardTermMapper.java index 07abc650..264070dd 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/ProcessProjectStandardTermMapper.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/ProcessProjectStandardTermMapper.java @@ -14,7 +14,7 @@ import java.util.List; public interface ProcessProjectStandardTermMapper extends BaseMapper { List getByResponsibleUnitLeader(@Param("processId") String processId, @Param("originUserId") String originUserId, @Param("hasModuleOwner") Boolean hasModuleOwner); - List getByResponsibleUnitLeaderSp(@Param("processId") String processId, @Param("originUserId") String originUserId); + List getByResponsibleUnitLeaderSp(@Param("processId") String processId, @Param("originUserId") String originUserId, @Param("parentId") String parentId); List getByModuleOwner(@Param("processId") String processId, @Param("originUserId") String originUserId, @Param("executionParentId") String executionParentId, @Param("hasDesignEngineer") Boolean hasDesignEngineer); diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardTermMapper.xml b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardTermMapper.xml index 556ea89f..8de5f2e4 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardTermMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/mapper/xml/ProcessProjectStandardTermMapper.xml @@ -61,7 +61,7 @@ diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java index 1b427f94..7d740de4 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java @@ -54,6 +54,7 @@ import org.activiti.engine.RuntimeService; import org.activiti.engine.TaskService; import org.activiti.engine.delegate.DelegateExecution; import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.runtime.Execution; import org.activiti.engine.task.Task; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; @@ -68,8 +69,6 @@ import javax.annotation.Resource; import java.util.*; import java.util.stream.Collectors; -import static org.apache.tools.ant.taskdefs.SetPermissions.NonPosixMode.pass; - /** * *@author liJiaRao @@ -131,11 +130,14 @@ public class ProcessProjectStandardService extends ServiceImpl processInfoVO, ProcessDTO processDTO, boolean pass) { + private void bszgjldspApprove(ProcessInfoVO processInfoVO, ProcessDTO processDTO, boolean pass, boolean hasParent) { String businessId = processInfoVO.getBusinessId(); ProcessApprovalRecord processApprovalRecord = processDTO.getProcessApprovalRecord(); String originUserId = processApprovalRecord.getOriginUserId(); @@ -722,6 +736,11 @@ public class ProcessProjectStandardService extends ServiceImpl updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.eq(ProcessProjectStandardTermUser::getProcessId, businessId); + updateWrapper.set(ProcessProjectStandardTermUser::getLeaderParentExecutionId, null); + termUserService.update(updateWrapper); } // 完成任务 String taskId = processDTO.getTaskId(); @@ -793,6 +812,8 @@ public class ProcessProjectStandardService extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.eq(ProcessProjectStandardTermUser::getProcessId, businessId); @@ -807,6 +828,13 @@ public class ProcessProjectStandardService extends ServiceImpl termUserIdMap = CollStreamUtil.toIdentityMap(termList, ProcessProjectStandardTerm::getTermUserId); List termApprovalList = new ArrayList<>(); + //删除之前的立项结果 + List termIdList = termList.stream().map(ProcessProjectStandardTerm::getId).collect(Collectors.toList()); + LambdaQueryWrapper deleteWrapper = new LambdaQueryWrapper<>(); + deleteWrapper.eq(ProcessProjectStandardTermApproval::getProcessId,businessId); + deleteWrapper.eq(ProcessProjectStandardTermApproval::getResponsibleUnitLeader,originUserId); + deleteWrapper.in(ProcessProjectStandardTermApproval::getTermId,termIdList); + List moduleOwnerIds = new ArrayList<>(); for (ProcessProjectStandardTermUser termUser : termUserList) { String termUserId = termUser.getId(); @@ -815,6 +843,7 @@ public class ProcessProjectStandardService extends ServiceImpl updateWrapper = new LambdaUpdateWrapper<>(); updateWrapper.eq(ProcessProjectStandardTermUser::getId,termUserId); updateWrapper.set(ProcessProjectStandardTermUser::getResponsibleUnitLeader, userId); + updateWrapper.set(ProcessProjectStandardTermUser::getLeaderParentExecutionId,executionParentId); if (StringUtils.isNotBlank(notInvolved)){ updateWrapper.set(ProcessProjectStandardTermUser::getNotInvolved,notInvolved); updateWrapper.set(ProcessProjectStandardTermUser::getAssessResults, AssessCommon.NOT_INVOLVED);