fix: 81657 年度制修订计划(标准化发起)（部所联络人选取审批人） 驳回后提交，驳回的那个流程还在

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<ProcessEsAnnualI
     @Resource
     private ILawsEnterpriseStandardService esService;
 
+    @Resource
+    private ProcessApprovalRecordService parService;
+
     @Override
     public void startProcess(AnnualInitDataVO annualInitData) {
         // 流程Key
@@ -107,6 +111,13 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
         String userId = UserUtils.getUserId();
         // 业务数据
         List<ProcessEsAnnualInit> 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<String, Object> actVariables = this.setVariables(annualInitData);
         // 删除草稿

laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java

@@ -419,4 +419,10 @@ public class ProcessAllService extends ServiceImpl<ProcessAllMapper, ProcessAll>
                             .set(ProcessEsInspectDelayApply::getLiaisons, toUserId));
         }
     }
+
+    public void deleteByPrcId(String prcId) {
+        LambdaQueryWrapper<ProcessAll> processAllLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        processAllLambdaQueryWrapper.eq(ProcessAll::getProcessInstanceId, prcId);
+        remove(processAllLambdaQueryWrapper);
+    }
 }

laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessApprovalRecordService.java

@@ -130,4 +130,10 @@ public class ProcessApprovalRecordService extends ServiceImpl<ProcessApprovalRec
         ProcessApprovalRecord approvalRecord = this.getOne(wrapper);
         return approvalRecord;
     }
+
+    public void deleteByPrcId(String oldPrcId) {
+        LambdaQueryWrapper<ProcessApprovalRecord> processAllLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        processAllLambdaQueryWrapper.eq(ProcessApprovalRecord::getProcessInstanceId, oldPrcId);
+        remove(processAllLambdaQueryWrapper);
+    }
 }