From 2fd73df42e1832596aa609467e61369690c82948 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Wed, 10 Jan 2024 09:10:56 +0800 Subject: [PATCH] =?UTF-8?q?fix:=2080535=20=E4=BC=81=E6=A0=87=E5=A4=8D?= =?UTF-8?q?=E5=AE=A1=E6=B5=81=E7=A8=8B--=E5=8F=91=E8=B5=B7=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E5=90=8E=E6=8F=90=E4=BA=A4=EF=BC=8C=E8=8D=89=E7=A8=BF?= =?UTF-8?q?=E6=9C=AA=E6=B6=88=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esAbolish/service/impl/ProcessEsAbolishServiceImpl.java | 2 ++ .../service/impl/ProcessEsAnnualInitServiceImpl.java | 2 ++ .../service/impl/ProcessEsAnnualReportServiceImpl.java | 2 ++ .../esArchive/service/impl/ProcessEsArchiveServiceImpl.java | 2 ++ .../esChange/service/impl/ProcessEsChangeServiceImpl.java | 2 ++ .../esEnable/service/impl/ProcessEsEnableServiceImpl.java | 2 ++ .../service/impl/ProcessEsInitChangeServiceImpl.java | 2 ++ .../esRecheck/service/impl/ProcessEsRecheckServiceImpl.java | 2 ++ .../process/esRevision/service/impl/EsRevisionServiceImpl.java | 2 ++ 9 files changed, 18 insertions(+) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/impl/ProcessEsAbolishServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/impl/ProcessEsAbolishServiceImpl.java index 8a5f843a..df23e299 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/impl/ProcessEsAbolishServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/impl/ProcessEsAbolishServiceImpl.java @@ -76,6 +76,8 @@ public class ProcessEsAbolishServiceImpl extends ServiceImpl variables = abolishData.getFlowUser(); // 流程变量 Map actVariables = this.setVariables(variables); + // 删除草稿 + actFlowCommonService.getExistDraftAndRemove(commonVO, ProcessTypeEnum.ES_ABOLISH); // 启动流程 ProcessInstance processInstance = actFlowCommonService.startProcess(processDefinitionKey, actVariables); // 获取流程实例ID 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 af40a6f2..69228693 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 @@ -111,6 +111,8 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl dataList = annualInitData.getDataList(); // 设置流程变量 Map actVariables = this.setVariables(annualInitData); + // 删除草稿 + actFlowCommonService.getExistDraftAndRemove(commonVO, ProcessTypeEnum.ES_ANNUAL_INIT); // 启动流程 ProcessInstance processInstance = actFlowCommonService.startProcess(processDefinitionKey, actVariables); // 获取流程实例ID diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java index 898db8df..e33fdf29 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java @@ -98,6 +98,8 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl variables = annualReportData.getFlowUser(); // 设置流程变量 Map actVariables = this.setVariables(annualReportData); + // 删除草稿 + actFlowCommonService.getExistDraftAndRemove(commonVO, ProcessTypeEnum.ES_ANNUAL_REPORT); // 启动流程 ProcessInstance processInstance = actFlowCommonService.startProcess(processDefinitionKey, actVariables); // 获取流程实例ID 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 91d1d9e5..19b57111 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 @@ -76,6 +76,8 @@ public class ProcessEsArchiveServiceImpl extends ServiceImpl variables = archiveData.getFlowUser(); // 设置流程变量 Map actVariables = this.setVariables(variables); + // 删除草稿 + actFlowCommonService.getExistDraftAndRemove(common, ProcessTypeEnum.ES_ARCHIVE); // 启动流程 ProcessInstance processInstance = actFlowCommonService.startProcess(processDefinitionKey, actVariables); // 获取流程实例ID diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/service/impl/ProcessEsChangeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/service/impl/ProcessEsChangeServiceImpl.java index 524ff000..7d83bfb0 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/service/impl/ProcessEsChangeServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/service/impl/ProcessEsChangeServiceImpl.java @@ -86,6 +86,8 @@ public class ProcessEsChangeServiceImpl extends ServiceImpl variables = changeData.getFlowUser(); // 设置流程变量 Map actVariables = this.setVariables(variables); + // 删除草稿 + actFlowCommonService.getExistDraftAndRemove(common, ProcessTypeEnum.ES_CHANGE); // 启动流程 ProcessInstance processInstance = actFlowCommonService.startProcess(processDefinitionKey, actVariables); // 获取流程实例ID diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/service/impl/ProcessEsEnableServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/service/impl/ProcessEsEnableServiceImpl.java index 3d794eb5..ce78d8cf 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/service/impl/ProcessEsEnableServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/service/impl/ProcessEsEnableServiceImpl.java @@ -76,6 +76,8 @@ public class ProcessEsEnableServiceImpl extends ServiceImpl variables = enableData.getFlowUser(); // 设置流程变量 Map actVariables = this.setVariables(variables); + // 删除草稿 + actFlowCommonService.getExistDraftAndRemove(common, ProcessTypeEnum.ES_ENABLE); // 启动流程 ProcessInstance processInstance = actFlowCommonService.startProcess(processDefinitionKey, actVariables); // 获取流程实例ID 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 741e4bf1..9559970c 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 @@ -87,6 +87,8 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl variables = this.setVariables(initChangeData); + // 删除草稿 + actFlowCommonService.getExistDraftAndRemove(commonVO, ProcessTypeEnum.ES_INIT_CHANGE); // 启动流程 ProcessInstance processInstance = actFlowCommonService.startProcess(processDefinitionKey, variables); // 获取流程实例ID diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/impl/ProcessEsRecheckServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/impl/ProcessEsRecheckServiceImpl.java index 86ca6821..5e5408f4 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/impl/ProcessEsRecheckServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/impl/ProcessEsRecheckServiceImpl.java @@ -72,6 +72,8 @@ public class ProcessEsRecheckServiceImpl extends ServiceImpl variables = recheckData.getFlowUser(); // 设置流程变量 Map actVariables = this.setVariables(variables); + // 删除草稿 + actFlowCommonService.getExistDraftAndRemove(common, ProcessTypeEnum.ES_RECHECK); // 启动流程 ProcessInstance processInstance = actFlowCommonService.startProcess(processDefinitionKey, actVariables); // 获取流程实例ID diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java index a67278a3..4cc056e9 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java @@ -96,6 +96,8 @@ public class EsRevisionServiceImpl extends ServiceImpl actVariables = this.setVariables(revisionData); + // 删除草稿 + actFlowCommonService.getExistDraftAndRemove(commonVO, ProcessTypeEnum.ES_REVISION); // 启动流程 ProcessInstance processInstance = actFlowCommonService.startProcess(processDefinitionKey, actVariables); // 获取流程实例ID