fix: 80535 企标复审流程--发起保存后提交，草稿未消失

laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/impl/ProcessEsAbolishServiceImpl.java

@@ -76,6 +76,8 @@ public class ProcessEsAbolishServiceImpl extends ServiceImpl<ProcessEsAbolishMap
         Map<String, Object> variables = abolishData.getFlowUser();
         // 流程变量
         Map<String, Object> actVariables = this.setVariables(variables);
+        // 删除草稿
+        actFlowCommonService.getExistDraftAndRemove(commonVO, ProcessTypeEnum.ES_ABOLISH);
         // 启动流程
         ProcessInstance processInstance = actFlowCommonService.startProcess(processDefinitionKey, actVariables);
         // 获取流程实例ID

laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java

@@ -111,6 +111,8 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
         List<ProcessEsAnnualInit> dataList = annualInitData.getDataList();
         // 设置流程变量
         Map<String, Object> actVariables = this.setVariables(annualInitData);
+        // 删除草稿
+        actFlowCommonService.getExistDraftAndRemove(commonVO, ProcessTypeEnum.ES_ANNUAL_INIT);
         // 启动流程
         ProcessInstance processInstance = actFlowCommonService.startProcess(processDefinitionKey, actVariables);
         // 获取流程实例ID

laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java

@@ -98,6 +98,8 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
         Map<String, Object> variables = annualReportData.getFlowUser();
         // 设置流程变量
         Map<String, Object> actVariables = this.setVariables(annualReportData);
+        // 删除草稿
+        actFlowCommonService.getExistDraftAndRemove(commonVO, ProcessTypeEnum.ES_ANNUAL_REPORT);
         // 启动流程
         ProcessInstance processInstance = actFlowCommonService.startProcess(processDefinitionKey, actVariables);
         // 获取流程实例ID

laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/service/impl/ProcessEsArchiveServiceImpl.java

@@ -76,6 +76,8 @@ public class ProcessEsArchiveServiceImpl extends ServiceImpl<ProcessEsArchiveMap
         Map<String, Object> variables = archiveData.getFlowUser();
         // 设置流程变量
         Map<String, Object> actVariables = this.setVariables(variables);
+        // 删除草稿
+        actFlowCommonService.getExistDraftAndRemove(common, ProcessTypeEnum.ES_ARCHIVE);
         // 启动流程
         ProcessInstance processInstance = actFlowCommonService.startProcess(processDefinitionKey, actVariables);
         // 获取流程实例ID

laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/service/impl/ProcessEsChangeServiceImpl.java

@@ -86,6 +86,8 @@ public class ProcessEsChangeServiceImpl extends ServiceImpl<ProcessEsChangeMappe
         Map<String, Object> variables = changeData.getFlowUser();
         // 设置流程变量
         Map<String, Object> actVariables = this.setVariables(variables);
+        // 删除草稿
+        actFlowCommonService.getExistDraftAndRemove(common, ProcessTypeEnum.ES_CHANGE);
         // 启动流程
         ProcessInstance processInstance = actFlowCommonService.startProcess(processDefinitionKey, actVariables);
         // 获取流程实例ID

laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/service/impl/ProcessEsEnableServiceImpl.java

@@ -76,6 +76,8 @@ public class ProcessEsEnableServiceImpl extends ServiceImpl<ProcessEsEnableMappe
         Map<String, Object> variables = enableData.getFlowUser();
         // 设置流程变量
         Map<String, Object> actVariables = this.setVariables(variables);
+        // 删除草稿
+        actFlowCommonService.getExistDraftAndRemove(common, ProcessTypeEnum.ES_ENABLE);
         // 启动流程
         ProcessInstance processInstance = actFlowCommonService.startProcess(processDefinitionKey, actVariables);
         // 获取流程实例ID

laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java

@@ -87,6 +87,8 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
         CommonVO commonVO = initChangeData.getCommonVO();
         // 设置流程变量
         Map<String, Object> variables = this.setVariables(initChangeData);
+        // 删除草稿
+        actFlowCommonService.getExistDraftAndRemove(commonVO, ProcessTypeEnum.ES_INIT_CHANGE);
         // 启动流程
         ProcessInstance processInstance = actFlowCommonService.startProcess(processDefinitionKey, variables);
         // 获取流程实例ID

laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/impl/ProcessEsRecheckServiceImpl.java

@@ -72,6 +72,8 @@ public class ProcessEsRecheckServiceImpl extends ServiceImpl<ProcessEsRecheckMap
         Map<String, Object> variables = recheckData.getFlowUser();
         // 设置流程变量
         Map<String, Object> actVariables = this.setVariables(variables);
+        // 删除草稿
+        actFlowCommonService.getExistDraftAndRemove(common, ProcessTypeEnum.ES_RECHECK);
         // 启动流程
         ProcessInstance processInstance = actFlowCommonService.startProcess(processDefinitionKey, actVariables);
         // 获取流程实例ID

laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java

@@ -96,6 +96,8 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
         ProcessEsRevision data = revisionData.getData();
         // 设置流程变量
         Map<String, Object> actVariables = this.setVariables(revisionData);
+        // 删除草稿
+        actFlowCommonService.getExistDraftAndRemove(commonVO, ProcessTypeEnum.ES_REVISION);
         // 启动流程
         ProcessInstance processInstance = actFlowCommonService.startProcess(processDefinitionKey, actVariables);
         // 获取流程实例ID