From 4bb61f0238e7be792f922323aed78be5e7eeb9ee Mon Sep 17 00:00:00 2001 From: PoffyZhang <99775271@qq.com> Date: Wed, 28 Jun 2023 16:44:51 +0800 Subject: [PATCH] =?UTF-8?q?=E9=BE=99=E6=B3=89=E5=B8=82=20=E5=8D=95?= =?UTF-8?q?=E7=8B=AC=E7=9A=84=E7=8A=B6=E6=80=81=E6=9C=BA=20=E5=BB=BA?= =?UTF-8?q?=E8=AE=BE=E6=96=B9=E6=A1=88=E7=A6=81=E7=94=A8=20=E7=9B=B4?= =?UTF-8?q?=E6=8E=A5=E4=B8=8B=E4=B8=80=E4=B8=AA=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../statemachine/builder/ProjectDeclareStateMachineJNBuilder.java | 2 +- .../statemachine/builder/ProjectDeclareStateMachineJYBuilder.java | 2 +- .../statemachine/builder/ProjectDeclareStateMachineKFQBuilder.java | 2 +- .../statemachine/builder/ProjectDeclareStateMachineLDBuilder.java | 2 +- .../statemachine/builder/ProjectDeclareStateMachineLQBuilder.java | 4 ++-- .../statemachine/builder/ProjectDeclareStateMachineQTBuilder.java | 2 +- .../statemachine/builder/ProjectDeclareStateMachineQYBuilder.java | 2 +- .../statemachine/builder/ProjectDeclareStateMachineSBJBuilder.java | 2 +- .../statemachine/builder/ProjectDeclareStateMachineSCBuilder.java | 2 +- .../statemachine/builder/ProjectDeclareStateMachineSYBuilder.java | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/builder/ProjectDeclareStateMachineJNBuilder.java b/pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/builder/ProjectDeclareStateMachineJNBuilder.java index a672e44..850696c 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/builder/ProjectDeclareStateMachineJNBuilder.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/builder/ProjectDeclareStateMachineJNBuilder.java @@ -260,7 +260,7 @@ public class ProjectDeclareStateMachineJNBuilder implements ProjectDeclareStateM @Override public StateMachineContext read(Project contextObj) { StateMachineContext result = new DefaultStateMachineContext(ProjectStatusEnum.getValue(contextObj.getStatus()), - null, null, null, null, RegionContant.LS_YH_CODE); + null, null, null, null, RegionContant.LS_JN_CODE); return result; } }); diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/builder/ProjectDeclareStateMachineJYBuilder.java b/pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/builder/ProjectDeclareStateMachineJYBuilder.java index ed78c6e..4046dca 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/builder/ProjectDeclareStateMachineJYBuilder.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/builder/ProjectDeclareStateMachineJYBuilder.java @@ -260,7 +260,7 @@ public class ProjectDeclareStateMachineJYBuilder implements ProjectDeclareStateM @Override public StateMachineContext read(Project contextObj) { StateMachineContext result = new DefaultStateMachineContext(ProjectStatusEnum.getValue(contextObj.getStatus()), - null, null, null, null, RegionContant.LS_YH_CODE); + null, null, null, null, RegionContant.LS_JY_CODE); return result; } }); diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/builder/ProjectDeclareStateMachineKFQBuilder.java b/pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/builder/ProjectDeclareStateMachineKFQBuilder.java index 12f88e8..0f77876 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/builder/ProjectDeclareStateMachineKFQBuilder.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/builder/ProjectDeclareStateMachineKFQBuilder.java @@ -260,7 +260,7 @@ public class ProjectDeclareStateMachineKFQBuilder implements ProjectDeclareState @Override public StateMachineContext read(Project contextObj) { StateMachineContext result = new DefaultStateMachineContext(ProjectStatusEnum.getValue(contextObj.getStatus()), - null, null, null, null, RegionContant.LS_YH_CODE); + null, null, null, null, RegionContant.LS_KFQ_CODE); return result; } }); diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/builder/ProjectDeclareStateMachineLDBuilder.java b/pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/builder/ProjectDeclareStateMachineLDBuilder.java index 379b077..d45f269 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/builder/ProjectDeclareStateMachineLDBuilder.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/builder/ProjectDeclareStateMachineLDBuilder.java @@ -260,7 +260,7 @@ public class ProjectDeclareStateMachineLDBuilder implements ProjectDeclareStateM @Override public StateMachineContext read(Project contextObj) { StateMachineContext result = new DefaultStateMachineContext(ProjectStatusEnum.getValue(contextObj.getStatus()), - null, null, null, null, RegionContant.LS_YH_CODE); + null, null, null, null, RegionContant.LS_LD_CODE); return result; } }); diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/builder/ProjectDeclareStateMachineLQBuilder.java b/pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/builder/ProjectDeclareStateMachineLQBuilder.java index e39ce26..807c427 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/builder/ProjectDeclareStateMachineLQBuilder.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/builder/ProjectDeclareStateMachineLQBuilder.java @@ -156,7 +156,7 @@ public class ProjectDeclareStateMachineLQBuilder implements ProjectDeclareStateM .source(ProjectStatusEnum.PENDING_PREQUALIFICATION_CHOICE) .first(ProjectStatusEnum.JOINT_REVIEW_BY_PROVINCIAL_DEPARTMENTS,projectDeclareGuardFactory.new PendingPreQualificationChoiceGuard(),new ProjectDeclareChoiceAction()) .last(ProjectStatusEnum.PRE_APPLYING,new ProjectDeclareChoiceAction()).and() - // 部门联审通过，从部门联审中到年度计划中 + // 部门联审通过，从部门联审中到 .withExternal() .source(ProjectStatusEnum.DEPARTMENT_JOINT_REVIEW) .target(ProjectStatusEnum.PLAN_TO_BE_DECLARED) @@ -261,7 +261,7 @@ public class ProjectDeclareStateMachineLQBuilder implements ProjectDeclareStateM @Override public StateMachineContext read(Project contextObj) { StateMachineContext result = new DefaultStateMachineContext(ProjectStatusEnum.getValue(contextObj.getStatus()), - null, null, null, null, RegionContant.LS_YH_CODE); + null, null, null, null, RegionContant.LS_LQ_CODE); return result; } }); diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/builder/ProjectDeclareStateMachineQTBuilder.java b/pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/builder/ProjectDeclareStateMachineQTBuilder.java index 28855db..b7daaac 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/builder/ProjectDeclareStateMachineQTBuilder.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/builder/ProjectDeclareStateMachineQTBuilder.java @@ -260,7 +260,7 @@ public class ProjectDeclareStateMachineQTBuilder implements ProjectDeclareStateM @Override public StateMachineContext read(Project contextObj) { StateMachineContext result = new DefaultStateMachineContext(ProjectStatusEnum.getValue(contextObj.getStatus()), - null, null, null, null, RegionContant.LS_YH_CODE); + null, null, null, null, RegionContant.LS_QT_CODE); return result; } }); diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/builder/ProjectDeclareStateMachineQYBuilder.java b/pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/builder/ProjectDeclareStateMachineQYBuilder.java index 52d862e..4587843 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/builder/ProjectDeclareStateMachineQYBuilder.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/builder/ProjectDeclareStateMachineQYBuilder.java @@ -260,7 +260,7 @@ public class ProjectDeclareStateMachineQYBuilder implements ProjectDeclareStateM @Override public StateMachineContext read(Project contextObj) { StateMachineContext result = new DefaultStateMachineContext(ProjectStatusEnum.getValue(contextObj.getStatus()), - null, null, null, null, RegionContant.LS_YH_CODE); + null, null, null, null, RegionContant.LS_QY_CODE); return result; } }); diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/builder/ProjectDeclareStateMachineSBJBuilder.java b/pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/builder/ProjectDeclareStateMachineSBJBuilder.java index 0330001..9a5bb68 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/builder/ProjectDeclareStateMachineSBJBuilder.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/builder/ProjectDeclareStateMachineSBJBuilder.java @@ -261,7 +261,7 @@ public class ProjectDeclareStateMachineSBJBuilder implements ProjectDeclareState @Override public StateMachineContext read(Project contextObj) { StateMachineContext result = new DefaultStateMachineContext(ProjectStatusEnum.getValue(contextObj.getStatus()), - null, null, null, null, RegionContant.LS_YH_CODE); + null, null, null, null, RegionContant.LS_SBJ_CODE); return result; } }); diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/builder/ProjectDeclareStateMachineSCBuilder.java b/pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/builder/ProjectDeclareStateMachineSCBuilder.java index b44a22c..29c5591 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/builder/ProjectDeclareStateMachineSCBuilder.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/builder/ProjectDeclareStateMachineSCBuilder.java @@ -260,7 +260,7 @@ public class ProjectDeclareStateMachineSCBuilder implements ProjectDeclareStateM @Override public StateMachineContext read(Project contextObj) { StateMachineContext result = new DefaultStateMachineContext(ProjectStatusEnum.getValue(contextObj.getStatus()), - null, null, null, null, RegionContant.LS_YH_CODE); + null, null, null, null, RegionContant.LS_SC_CODE); return result; } }); diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/builder/ProjectDeclareStateMachineSYBuilder.java b/pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/builder/ProjectDeclareStateMachineSYBuilder.java index 6b6275a..a6e5d47 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/builder/ProjectDeclareStateMachineSYBuilder.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/builder/ProjectDeclareStateMachineSYBuilder.java @@ -260,7 +260,7 @@ public class ProjectDeclareStateMachineSYBuilder implements ProjectDeclareStateM @Override public StateMachineContext read(Project contextObj) { StateMachineContext result = new DefaultStateMachineContext(ProjectStatusEnum.getValue(contextObj.getStatus()), - null, null, null, null, RegionContant.LS_YH_CODE); + null, null, null, null, RegionContant.LS_SY_CODE); return result; } });