From 4aa52390de1392542c887759101c0512032f5b7f Mon Sep 17 00:00:00 2001 From: caihaohan Date: Wed, 7 Feb 2024 10:44:27 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=2081854=20=E4=BC=81=E6=A0=87=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E5=8F=98=E6=9B=B4--=E5=B7=A5=E4=BD=9C=E7=BB=88?= =?UTF-8?q?=E6=AD=A2=E6=B5=81=E7=A8=8B=E5=AE=8C=E6=88=90=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=92=A4=E5=9B=9E=E5=88=B6=E4=BF=AE=E8=AE=A2?= =?UTF-8?q?=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../process/esRevision/service/impl/EsRevisionServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) 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 fc5fbe41..294e1a97 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 @@ -210,6 +210,9 @@ public class EsRevisionServiceImpl extends ServiceImpl Date: Wed, 7 Feb 2024 10:54:33 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=2081857=20=E4=BC=81=E6=A0=87=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E5=8F=98=E6=9B=B4--=E5=90=88=E5=B9=B6--=E6=96=B0?= =?UTF-8?q?=E7=94=9F=E6=88=90=E7=9A=84=E4=BC=81=E6=A0=87=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E5=88=B6=E4=BF=AE=E8=AE=A2=E7=B1=BB=E5=9E=8B=E4=B8=8D=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esInitChange/listener/ProcessESInitChangeEndListener.java | 1 + 1 file changed, 1 insertion(+) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/listener/ProcessESInitChangeEndListener.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/listener/ProcessESInitChangeEndListener.java index 75f86552..1b1c6a0a 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/listener/ProcessESInitChangeEndListener.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/listener/ProcessESInitChangeEndListener.java @@ -131,6 +131,7 @@ public class ProcessESInitChangeEndListener implements ExecutionListener { espService.deleteById(processEsInitChange.getStandardIdTwo()); // 生成新企标计划 EnterpriseStandardPlan plan = BeanCopyUtils.copyBean(processEsInitChange, EnterpriseStandardPlan.class); + plan.setProjectType(ESPProjectType.ENACT.getValue()); espService.save(plan); //发起制修订流程 esRevisionService.autoStartProcess(getRevisionDataVO(plan)); From 039157243c4716dcace8b02e0b19c3936d25a2e0 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Wed, 7 Feb 2024 11:01:19 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=2081857=20=E4=BC=81=E6=A0=87=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E5=8F=98=E6=9B=B4--=E5=90=88=E5=B9=B6--=E6=96=B0?= =?UTF-8?q?=E7=94=9F=E6=88=90=E7=9A=84=E4=BC=81=E6=A0=87=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E5=88=B6=E4=BF=AE=E8=AE=A2=E7=B1=BB=E5=9E=8B=E4=B8=8D=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esInitChange/listener/ProcessESInitChangeEndListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/listener/ProcessESInitChangeEndListener.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/listener/ProcessESInitChangeEndListener.java index 1b1c6a0a..ba9a5b18 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/listener/ProcessESInitChangeEndListener.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/listener/ProcessESInitChangeEndListener.java @@ -131,7 +131,7 @@ public class ProcessESInitChangeEndListener implements ExecutionListener { espService.deleteById(processEsInitChange.getStandardIdTwo()); // 生成新企标计划 EnterpriseStandardPlan plan = BeanCopyUtils.copyBean(processEsInitChange, EnterpriseStandardPlan.class); - plan.setProjectType(ESPProjectType.ENACT.getValue()); + plan.setApplicationCategory(ESPProjectType.ENACT.getValue()); espService.save(plan); //发起制修订流程 esRevisionService.autoStartProcess(getRevisionDataVO(plan));