From 6e3604afaaf55c4abc57ef25950946e87d2aac8f Mon Sep 17 00:00:00 2001 From: caihaohan Date: Wed, 3 Jan 2024 16:03:59 +0800 Subject: [PATCH] =?UTF-8?q?fix:=2079819=20=E4=BC=81=E6=A0=87=E5=BA=9F?= =?UTF-8?q?=E6=AD=A2/=E5=B0=81=E5=AD=98/=E5=90=AF=E7=94=A8=E6=B5=81?= =?UTF-8?q?=E7=A8=8B-=E5=8F=91=E8=B5=B71=E4=B8=AA=E6=96=B0=E7=9A=84?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=BF=9D=E5=AD=98=E5=90=8E=EF=BC=8C=E4=B9=8B?= =?UTF-8?q?=E5=89=8D=E4=BF=9D=E5=AD=98=E7=9A=84=E6=B5=81=E7=A8=8B=E4=B8=8D?= =?UTF-8?q?=E8=A7=81=E4=BA=86?= 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 deletions(-) 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 010aaa15..c94a7020 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,8 +76,6 @@ 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 27cb9168..0f327a5b 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,8 +111,6 @@ 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 9bb4d998..79d69890 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,8 +98,6 @@ 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 2b30d521..4c5423f2 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,8 +76,6 @@ 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 3072121d..47c34434 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 @@ -83,8 +83,6 @@ 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 6126821a..6d3ecf2e 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,8 +76,6 @@ 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 ee776079..99a8daa9 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,8 +87,6 @@ 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 057663d3..1abd7478 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,8 +72,6 @@ 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 ea150f85..b02de7b5 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,8 +96,6 @@ public class EsRevisionServiceImpl extends ServiceImpl actVariables = this.setVariables(revisionData); - // 删除草稿 - actFlowCommonService.getExistDraftAndRemove(commonVO, ProcessTypeEnum.ES_REVISION); // 启动流程 ProcessInstance processInstance = actFlowCommonService.startProcess(processDefinitionKey, actVariables); // 获取流程实例ID