diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java index 676f08e9..6c3feb06 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java @@ -24,6 +24,7 @@ import com.jero.modules.activiti.process.fb.dto.BasicProcessInfoDTO; import com.jero.modules.activiti.process.fb.service.IProcessHandleService; import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO; import com.jero.modules.activiti.service.ProcessAllService; +import com.jero.modules.activiti.service.ProcessApprovalRecordService; import com.jero.modules.activiti.service.ProcessNodeLinkService; import com.jero.modules.activiti.util.ExcelUtils; import com.jero.modules.laws.common.util.ImportUtil; @@ -97,6 +98,9 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl dataList = annualInitData.getDataList(); + // 如果dataList中有流程实例Id,则需要去删除对应流程 + ProcessEsAnnualInit processEsAnnualInit = dataList.get(0); + String oldPrcId = processEsAnnualInit.getProcessInstanceId(); + if (StrUtil.isNotBlank(oldPrcId)) { + processAllService.deleteByPrcId(oldPrcId); + parService.deleteByPrcId(oldPrcId); + } // 设置流程变量 Map actVariables = this.setVariables(annualInitData); // 删除草稿 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 47ba7834..180fcda2 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 @@ -419,4 +419,10 @@ public class ProcessAllService extends ServiceImpl .set(ProcessEsInspectDelayApply::getLiaisons, toUserId)); } } + + public void deleteByPrcId(String prcId) { + LambdaQueryWrapper processAllLambdaQueryWrapper = new LambdaQueryWrapper<>(); + processAllLambdaQueryWrapper.eq(ProcessAll::getProcessInstanceId, prcId); + remove(processAllLambdaQueryWrapper); + } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessApprovalRecordService.java b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessApprovalRecordService.java index a3dc447f..6fc1b3a8 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessApprovalRecordService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessApprovalRecordService.java @@ -130,4 +130,10 @@ public class ProcessApprovalRecordService extends ServiceImpl processAllLambdaQueryWrapper = new LambdaQueryWrapper<>(); + processAllLambdaQueryWrapper.eq(ProcessApprovalRecord::getProcessInstanceId, oldPrcId); + remove(processAllLambdaQueryWrapper); + } }