From 04208ff9009af4b1fe059b75c7d3f4c5150eaebc Mon Sep 17 00:00:00 2001 From: caihaohan Date: Thu, 22 Feb 2024 17:02:18 +0800 Subject: [PATCH] =?UTF-8?q?fix:=2081873=20=E5=B9=B4=E5=BA=A6=E5=88=B6?= =?UTF-8?q?=E4=BF=AE=E8=AE=A2=E8=AE=A1=E5=88=92(=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=8C=96=E5=8F=91=E8=B5=B7)--=E4=B8=8D=E5=90=8C=E7=9A=84?= =?UTF-8?q?=E4=B8=BB=E8=B5=B7=E8=8D=89=E5=8D=95=E4=BD=8D=E4=B8=BB=E7=AE=A1?= =?UTF-8?q?=E7=BA=A7=E9=A2=86=E5=AF=BC=E5=AE=A1=E6=89=B9=E4=B8=8B=E5=8F=91?= =?UTF-8?q?=EF=BC=8C=E7=9B=B8=E5=90=8C=E7=9A=84=E4=B8=BB=E8=B5=B7=E8=8D=89?= =?UTF-8?q?=E4=BA=BA=E5=A1=AB=E5=86=99=E4=BF=A1=E6=81=AF=EF=BC=8C=E7=AC=AC?= =?UTF-8?q?2=E4=B8=AA=E5=A4=84=E7=90=86=E7=9A=84=E5=BE=85=E5=8A=9E?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=90=88=E5=B9=B6=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../listener/MainDraftLeaderDistributeCreateListener.java | 7 +++++-- .../service/impl/ProcessEsAnnualInitServiceImpl.java | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/listener/MainDraftLeaderDistributeCreateListener.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/listener/MainDraftLeaderDistributeCreateListener.java index 48f5149a..2ba7df09 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/listener/MainDraftLeaderDistributeCreateListener.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/listener/MainDraftLeaderDistributeCreateListener.java @@ -5,6 +5,7 @@ import com.jero.modules.activiti.process.esAnnualInit.entity.ProcessEsAnnualInit import com.jero.modules.activiti.process.esAnnualInit.service.impl.ProcessEsAnnualInitServiceImpl; import com.jero.modules.activiti.util.ThreadLocalUtil; import lombok.extern.slf4j.Slf4j; +import org.activiti.engine.TaskService; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; import org.springframework.stereotype.Component; @@ -23,6 +24,9 @@ public class MainDraftLeaderDistributeCreateListener implements TaskListener { @Resource private ProcessEsAnnualInitServiceImpl annualInitService; + @Resource + private TaskService taskService; + /** * 流程结束之后需要把数据存入企标计划数据库 * @@ -30,7 +34,7 @@ public class MainDraftLeaderDistributeCreateListener implements TaskListener { */ @Override public void notify(DelegateTask delegateTask) { - String contactExecutionId = (String) ThreadLocalUtil.get("contactExecutionId"); + String contactExecutionId = (String) taskService.getVariable(delegateTask.getId(), "contactExecutionId"); String executionId = delegateTask.getExecutionId(); String approvalUser = (String) delegateTask.getVariable("approvalUser"); LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); @@ -39,6 +43,5 @@ public class MainDraftLeaderDistributeCreateListener implements TaskListener { List list = annualInitService.list(wrapper); list.forEach(l -> l.setExecutionId(executionId)); annualInitService.updateBatchById(list); - ThreadLocalUtil.remove(); } } 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 80b58f11..be516b56 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 @@ -323,7 +323,7 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl data.setExecutionId(executionId)); saveOrUpdateBatch(dataList); - ThreadLocalUtil.put("contactExecutionId", executionId); + taskService.setVariable(taskId, "contactExecutionId", executionId); } else { // 找到所有被驳回的数据，发起新流程 annualInitData.setDataList(dbDataList);