diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/entity/CounterSignNodeNameConstants.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/entity/CounterSignNodeNameConstants.java new file mode 100644 index 00000000..f2cb3249 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/entity/CounterSignNodeNameConstants.java @@ -0,0 +1,11 @@ +package com.jero.modules.activiti.process.common.entity; + +/** + * @author: Mzaxd + * @Date: 2023/11/28 16:44 + */ +public class CounterSignNodeNameConstants { + + public static final String COUNTER_SIGN_NODE_NAME = "相关人员会签"; + +} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java index fa9a67f5..acc89ba7 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java @@ -9,6 +9,7 @@ import com.jero.modules.activiti.entity.ProcessAll; import com.jero.modules.activiti.entity.ProcessApprovalRecord; import com.jero.modules.activiti.enums.CommitFlagEnum; import com.jero.modules.activiti.enums.FinishFlagEnum; +import com.jero.modules.activiti.enums.ProcessStatusEnum; import com.jero.modules.activiti.enums.ProcessTypeEnum; import com.jero.modules.activiti.mapper.ProcessNodeMapper; import com.jero.modules.activiti.process.common.entity.CommonVO; @@ -429,4 +430,18 @@ public class ActFlowCommonService { draftWrapper.eq(ProcessDraft::getProcessInstanceId, processInstanceId); processDraftService.remove(draftWrapper); } + + /** + * 会签节点驳回后,将其余节点recode设置为 未处理 状态 + * @param prcId + * @param nodeName + */ + public void updateOtherCountersignRecodeStatus(String prcId, String nodeName) { + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.eq(ProcessApprovalRecord::getProcessInstanceId, prcId); + updateWrapper.eq(ProcessApprovalRecord::getFinishFlag, FinishFlagEnum.INCOMPLETE.getValue()); + updateWrapper.eq(ProcessApprovalRecord::getTaskName, nodeName); + updateWrapper.set(ProcessApprovalRecord::getFinishFlag, ProcessStatusEnum.WITHDRAWN.getValue()); + processApprovalRecordService.update(updateWrapper); + } } \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/service/impl/ProcessEsArchiveServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/service/impl/ProcessEsArchiveServiceImpl.java index 4391ccf7..38dc4df9 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/service/impl/ProcessEsArchiveServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/service/impl/ProcessEsArchiveServiceImpl.java @@ -8,6 +8,7 @@ import com.jero.common.constant.enums.YesOrNoEnum; import com.jero.common.exception.JeroBootException; import com.jero.modules.activiti.enums.ProcessTypeEnum; import com.jero.modules.activiti.process.common.entity.CommonVO; +import com.jero.modules.activiti.process.common.entity.CounterSignNodeNameConstants; import com.jero.modules.activiti.process.common.entity.ProcessDraft; import com.jero.modules.activiti.process.common.enums.ProcessType; import com.jero.modules.activiti.process.common.service.ActFlowCommonService; @@ -162,6 +163,10 @@ public class ProcessEsArchiveServiceImpl extends ServiceImpl