diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java index cac3b0a6..d44d17f6 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java @@ -252,7 +252,18 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.eq(ProcessEsInitChange::getProcessInstanceId, processInstanceId); + remove(updateWrapper); + initChangeList.forEach(e -> e.setProcessInstanceId(processInstanceId)); + saveBatch(initChangeList); + // 根据流程实例id更新流程总表 + String prcName = commonVO.getPrcName(); + String prcMes = commonVO.getPrcMes(); + Date dueTime = commonVO.getDueTime(); + Integer prcType = ProcessTypeEnum.ES_INIT_CHANGE.getValue(); + actFlowCommonService.updateProcessAll(processInstanceId, userId, prcName, prcMes, prcType, dueTime); } if (flowUserInfoVO != null && !flowUserInfoVO.isEmpty()) { Map variables = setVariables(initChangeDataVO); diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java index 75b4fda3..4b3f9ca7 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java @@ -25,6 +25,7 @@ import com.jero.modules.activiti.vo.DelegateTaskParam; import com.jero.modules.activiti.vo.ResolveTaskParam; import com.jero.modules.laws.common.constant.MessageTemplateCodeCommon; import com.jero.modules.laws.common.util.CurrentUserUtil; +import lombok.extern.slf4j.Slf4j; import org.activiti.engine.HistoryService; import org.activiti.engine.RuntimeService; import org.activiti.engine.TaskService; @@ -45,6 +46,7 @@ import java.util.stream.Collectors; *@date 2023-10-16 15:49 */ @Service +@Slf4j public class ProcessAllService extends ServiceImpl { @Resource private ProcessAllMapper processAllMapper; @@ -102,6 +104,10 @@ public class ProcessAllService extends ServiceImpl public void forcedWithdrawal(String processInstanceId) { //获得流程总表 ProcessAll processAll = getByProcessInstanceId(processInstanceId); + if (processAll == null){ + log.info("流程实例ID为{}的流程总表数据不存在,强制撤回失败", processInstanceId); + return; + } //删除流程中所有草稿(除了初始草稿) LambdaUpdateWrapper processDraftUpdateWrapper = new LambdaUpdateWrapper<>(); processDraftUpdateWrapper.eq(ProcessDraft::getProcessInstanceId, processInstanceId);