Merge branch 'ls2_operation_0731' of http://git.ningdatech.com/liushuai/project-management into dev

 Conflicts:

	pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/action/ProjectDeclareAction.java

	pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/action/ProjectDeclareJNAction.java

	pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/action/ProjectDeclareJYAction.java

	pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/action/ProjectDeclareKFBAction.java

	pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/action/ProjectDeclareLDAction.java

	pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/action/ProjectDeclareLQAction.java

	pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/action/ProjectDeclareQTAction.java

	pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/action/ProjectDeclareQYAction.java

	pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/action/ProjectDeclareSBJAction.java

	pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/action/ProjectDeclareSCAction.java

	pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/action/ProjectDeclareSYAction.java

	pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/action/ProjectDeclareYHAction.java

	pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/builder/ProjectDeclareStateMachineJNBuilder.java

	pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/builder/ProjectDeclareStateMachineJYBuilder.java

	pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/builder/ProjectDeclareStateMachineKFQBuilder.java

	pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/builder/ProjectDeclareStateMachineLDBuilder.java

	pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/builder/ProjectDeclareStateMachineLQBuilder.java

	pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/builder/ProjectDeclareStateMachineQTBuilder.java

	pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/builder/ProjectDeclareStateMachineQYBuilder.java

	pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/builder/ProjectDeclareStateMachineSBJBuilder.java

	pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/builder/ProjectDeclareStateMachineSCBuilder.java

	pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/builder/ProjectDeclareStateMachineSYBuilder.java

	pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/builder/ProjectDeclareStateMachineYHBuilder.java

pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/action/ProjectDeclareAction.java

@@ -209,9 +209,14 @@ public class ProjectDeclareAction {
     }
 
 
-    @OnTransition(source = "TO_BE_PURCHASED", target = "UNDER_CONSTRUCTION")
+    @OnTransition(source = "TO_BE_PURCHASED", target = "OPERATION")
     public void PURCHASE_PUT_ON_RECORD(Message<ProjectStatusChangeEvent> message) {
         Project project = (Project) message.getHeaders().get(PROJECT_DECLARE);
+        project.setStatus(ProjectStatusEnum.OPERATION.getCode());
+    }
+    @OnTransition(source = "OPERATION", target = "UNDER_CONSTRUCTION")
+    public void START_TO_WORK(Message<ProjectStatusChangeEvent> message) {
+        Project project = (Project) message.getHeaders().get(PROJECT_DECLARE);
         project.setStatus(ProjectStatusEnum.UNDER_CONSTRUCTION.getCode());
     }
 

pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/action/ProjectDeclareJNAction.java

@@ -206,9 +206,14 @@ public class ProjectDeclareJNAction {
     }
 
 
-    @OnTransition(source = "TO_BE_PURCHASED", target = "UNDER_CONSTRUCTION")
+    @OnTransition(source = "TO_BE_PURCHASED", target = "OPERATION")
     public void PURCHASE_PUT_ON_RECORD(Message<ProjectStatusChangeEvent> message) {
         Project project = (Project) message.getHeaders().get(PROJECT_DECLARE);
+        project.setStatus(ProjectStatusEnum.OPERATION.getCode());
+    }
+    @OnTransition(source = "OPERATION", target = "UNDER_CONSTRUCTION")
+    public void START_TO_WORK(Message<ProjectStatusChangeEvent> message) {
+        Project project = (Project) message.getHeaders().get(PROJECT_DECLARE);
         project.setStatus(ProjectStatusEnum.UNDER_CONSTRUCTION.getCode());
     }
 

pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/action/ProjectDeclareJYAction.java

@@ -204,10 +204,15 @@ public class ProjectDeclareJYAction {
         project.setStatus(ProjectStatusEnum.SCHEME_UNDER_REVIEW.getCode());
     }
 
-
-    @OnTransition(source = "TO_BE_PURCHASED", target = "UNDER_CONSTRUCTION")
+    @OnTransition(source = "TO_BE_PURCHASED", target = "OPERATION")
     public void PURCHASE_PUT_ON_RECORD(Message<ProjectStatusChangeEvent> message) {
         Project project = (Project) message.getHeaders().get(PROJECT_DECLARE);
+        project.setStatus(ProjectStatusEnum.OPERATION.getCode());
+    }
+
+    @OnTransition(source = "OPERATION", target = "UNDER_CONSTRUCTION")
+    public void START_TO_WORK(Message<ProjectStatusChangeEvent> message) {
+        Project project = (Project) message.getHeaders().get(PROJECT_DECLARE);
         project.setStatus(ProjectStatusEnum.UNDER_CONSTRUCTION.getCode());
     }
 

pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/action/ProjectDeclareKFBAction.java

@@ -204,10 +204,15 @@ public class ProjectDeclareKFBAction {
         project.setStatus(ProjectStatusEnum.SCHEME_UNDER_REVIEW.getCode());
     }
 
-
-    @OnTransition(source = "TO_BE_PURCHASED", target = "UNDER_CONSTRUCTION")
+    @OnTransition(source = "TO_BE_PURCHASED", target = "OPERATION")
     public void PURCHASE_PUT_ON_RECORD(Message<ProjectStatusChangeEvent> message) {
         Project project = (Project) message.getHeaders().get(PROJECT_DECLARE);
+        project.setStatus(ProjectStatusEnum.OPERATION.getCode());
+    }
+
+    @OnTransition(source = "OPERATION", target = "UNDER_CONSTRUCTION")
+    public void START_TO_WORK(Message<ProjectStatusChangeEvent> message) {
+        Project project = (Project) message.getHeaders().get(PROJECT_DECLARE);
         project.setStatus(ProjectStatusEnum.UNDER_CONSTRUCTION.getCode());
     }
 

pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/action/ProjectDeclareLDAction.java

@@ -204,10 +204,15 @@ public class ProjectDeclareLDAction {
         project.setStatus(ProjectStatusEnum.SCHEME_UNDER_REVIEW.getCode());
     }
 
-
-    @OnTransition(source = "TO_BE_PURCHASED", target = "UNDER_CONSTRUCTION")
+    @OnTransition(source = "TO_BE_PURCHASED", target = "OPERATION")
     public void PURCHASE_PUT_ON_RECORD(Message<ProjectStatusChangeEvent> message) {
         Project project = (Project) message.getHeaders().get(PROJECT_DECLARE);
+        project.setStatus(ProjectStatusEnum.OPERATION.getCode());
+    }
+
+    @OnTransition(source = "OPERATION", target = "UNDER_CONSTRUCTION")
+    public void START_TO_WORK(Message<ProjectStatusChangeEvent> message) {
+        Project project = (Project) message.getHeaders().get(PROJECT_DECLARE);
         project.setStatus(ProjectStatusEnum.UNDER_CONSTRUCTION.getCode());
     }
 

pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/action/ProjectDeclareLQAction.java

@@ -204,10 +204,15 @@ public class ProjectDeclareLQAction {
         project.setStatus(ProjectStatusEnum.SCHEME_UNDER_REVIEW.getCode());
     }
 
-
-    @OnTransition(source = "TO_BE_PURCHASED", target = "UNDER_CONSTRUCTION")
+    @OnTransition(source = "TO_BE_PURCHASED", target = "OPERATION")
     public void PURCHASE_PUT_ON_RECORD(Message<ProjectStatusChangeEvent> message) {
         Project project = (Project) message.getHeaders().get(PROJECT_DECLARE);
+        project.setStatus(ProjectStatusEnum.OPERATION.getCode());
+    }
+
+    @OnTransition(source = "OPERATION", target = "UNDER_CONSTRUCTION")
+    public void START_TO_WORK(Message<ProjectStatusChangeEvent> message) {
+        Project project = (Project) message.getHeaders().get(PROJECT_DECLARE);
         project.setStatus(ProjectStatusEnum.UNDER_CONSTRUCTION.getCode());
     }
 

pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/action/ProjectDeclareQTAction.java

@@ -204,10 +204,15 @@ public class ProjectDeclareQTAction {
         project.setStatus(ProjectStatusEnum.SCHEME_UNDER_REVIEW.getCode());
     }
 
-
-    @OnTransition(source = "TO_BE_PURCHASED", target = "UNDER_CONSTRUCTION")
+    @OnTransition(source = "TO_BE_PURCHASED", target = "OPERATION")
     public void PURCHASE_PUT_ON_RECORD(Message<ProjectStatusChangeEvent> message) {
         Project project = (Project) message.getHeaders().get(PROJECT_DECLARE);
+        project.setStatus(ProjectStatusEnum.OPERATION.getCode());
+    }
+
+    @OnTransition(source = "OPERATION", target = "UNDER_CONSTRUCTION")
+    public void START_TO_WORK(Message<ProjectStatusChangeEvent> message) {
+        Project project = (Project) message.getHeaders().get(PROJECT_DECLARE);
         project.setStatus(ProjectStatusEnum.UNDER_CONSTRUCTION.getCode());
     }
 

pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/action/ProjectDeclareQYAction.java

@@ -204,10 +204,15 @@ public class ProjectDeclareQYAction {
         project.setStatus(ProjectStatusEnum.SCHEME_UNDER_REVIEW.getCode());
     }
 
-
-    @OnTransition(source = "TO_BE_PURCHASED", target = "UNDER_CONSTRUCTION")
+    @OnTransition(source = "TO_BE_PURCHASED", target = "OPERATION")
     public void PURCHASE_PUT_ON_RECORD(Message<ProjectStatusChangeEvent> message) {
         Project project = (Project) message.getHeaders().get(PROJECT_DECLARE);
+        project.setStatus(ProjectStatusEnum.OPERATION.getCode());
+    }
+
+    @OnTransition(source = "OPERATION", target = "UNDER_CONSTRUCTION")
+    public void START_TO_WORK(Message<ProjectStatusChangeEvent> message) {
+        Project project = (Project) message.getHeaders().get(PROJECT_DECLARE);
         project.setStatus(ProjectStatusEnum.UNDER_CONSTRUCTION.getCode());
     }
 

pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/action/ProjectDeclareSBJAction.java

@@ -204,10 +204,15 @@ public class ProjectDeclareSBJAction {
         project.setStatus(ProjectStatusEnum.SCHEME_UNDER_REVIEW.getCode());
     }
 
-
-    @OnTransition(source = "TO_BE_PURCHASED", target = "UNDER_CONSTRUCTION")
+    @OnTransition(source = "TO_BE_PURCHASED", target = "OPERATION")
     public void PURCHASE_PUT_ON_RECORD(Message<ProjectStatusChangeEvent> message) {
         Project project = (Project) message.getHeaders().get(PROJECT_DECLARE);
+        project.setStatus(ProjectStatusEnum.OPERATION.getCode());
+    }
+
+    @OnTransition(source = "OPERATION", target = "UNDER_CONSTRUCTION")
+    public void START_TO_WORK(Message<ProjectStatusChangeEvent> message) {
+        Project project = (Project) message.getHeaders().get(PROJECT_DECLARE);
         project.setStatus(ProjectStatusEnum.UNDER_CONSTRUCTION.getCode());
     }
 

pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/action/ProjectDeclareSCAction.java

@@ -212,10 +212,15 @@ public class ProjectDeclareSCAction {
         project.setStatus(ProjectStatusEnum.SCHEME_UNDER_REVIEW.getCode());
     }
 
-
-    @OnTransition(source = "TO_BE_PURCHASED", target = "UNDER_CONSTRUCTION")
+    @OnTransition(source = "TO_BE_PURCHASED", target = "OPERATION")
     public void PURCHASE_PUT_ON_RECORD(Message<ProjectStatusChangeEvent> message) {
         Project project = (Project) message.getHeaders().get(PROJECT_DECLARE);
+        project.setStatus(ProjectStatusEnum.OPERATION.getCode());
+    }
+
+    @OnTransition(source = "OPERATION", target = "UNDER_CONSTRUCTION")
+    public void START_TO_WORK(Message<ProjectStatusChangeEvent> message) {
+        Project project = (Project) message.getHeaders().get(PROJECT_DECLARE);
         project.setStatus(ProjectStatusEnum.UNDER_CONSTRUCTION.getCode());
     }
 

pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/action/ProjectDeclareSYAction.java

@@ -204,10 +204,15 @@ public class ProjectDeclareSYAction {
         project.setStatus(ProjectStatusEnum.SCHEME_UNDER_REVIEW.getCode());
     }
 
-
-    @OnTransition(source = "TO_BE_PURCHASED", target = "UNDER_CONSTRUCTION")
+    @OnTransition(source = "TO_BE_PURCHASED", target = "OPERATION")
     public void PURCHASE_PUT_ON_RECORD(Message<ProjectStatusChangeEvent> message) {
         Project project = (Project) message.getHeaders().get(PROJECT_DECLARE);
+        project.setStatus(ProjectStatusEnum.OPERATION.getCode());
+    }
+
+    @OnTransition(source = "OPERATION", target = "UNDER_CONSTRUCTION")
+    public void START_TO_WORK(Message<ProjectStatusChangeEvent> message) {
+        Project project = (Project) message.getHeaders().get(PROJECT_DECLARE);
         project.setStatus(ProjectStatusEnum.UNDER_CONSTRUCTION.getCode());
     }
 

pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/action/ProjectDeclareYHAction.java

@@ -205,9 +205,14 @@ public class ProjectDeclareYHAction {
     }
 
 
-    @OnTransition(source = "TO_BE_PURCHASED", target = "UNDER_CONSTRUCTION")
+    @OnTransition(source = "TO_BE_PURCHASED", target = "OPERATION")
     public void PURCHASE_PUT_ON_RECORD(Message<ProjectStatusChangeEvent> message) {
         Project project = (Project) message.getHeaders().get(PROJECT_DECLARE);
+        project.setStatus(ProjectStatusEnum.OPERATION.getCode());
+    }
+    @OnTransition(source = "OPERATION", target = "UNDER_CONSTRUCTION")
+    public void START_TO_WORK(Message<ProjectStatusChangeEvent> message) {
+        Project project = (Project) message.getHeaders().get(PROJECT_DECLARE);
         project.setStatus(ProjectStatusEnum.UNDER_CONSTRUCTION.getCode());
     }
 

pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/builder/ProjectDeclareStateMachineJNBuilder.java

@@ -211,11 +211,17 @@ public class ProjectDeclareStateMachineJNBuilder implements ProjectDeclareStateM
                 .source(ProjectStatusEnum.TO_BE_APPROVED)
                 .target(ProjectStatusEnum.TO_BE_PURCHASED)
                 .event(ProjectStatusChangeEvent.PROJECT_APPROVAL).and()
-                // 待采购采购备案，从待采购到建设中
+                // 待采购采购备案，从待采购到实施中
                 .withExternal()
                 .source(ProjectStatusEnum.TO_BE_PURCHASED)
-                .target(ProjectStatusEnum.UNDER_CONSTRUCTION)
+                .target(ProjectStatusEnum.OPERATION)
                 .event(ProjectStatusChangeEvent.PURCHASE_PUT_ON_RECORD).and()
+
+                // 待开工 实施，从实施到建设中
+                .withExternal()
+                .source(ProjectStatusEnum.OPERATION)
+                .target(ProjectStatusEnum.UNDER_CONSTRUCTION)
+                .event(ProjectStatusChangeEvent.START_TO_WORK).and()
                 // 建设中初验备案，从建设中到待终验
                 .withExternal()
                 .source(ProjectStatusEnum.UNDER_CONSTRUCTION)

pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/builder/ProjectDeclareStateMachineJYBuilder.java

@@ -211,11 +211,17 @@ public class ProjectDeclareStateMachineJYBuilder implements ProjectDeclareStateM
                 .source(ProjectStatusEnum.TO_BE_APPROVED)
                 .target(ProjectStatusEnum.TO_BE_PURCHASED)
                 .event(ProjectStatusChangeEvent.PROJECT_APPROVAL).and()
-                // 待采购采购备案，从待采购到建设中
+                // 待采购采购备案，从待采购到实施中
                 .withExternal()
                 .source(ProjectStatusEnum.TO_BE_PURCHASED)
-                .target(ProjectStatusEnum.UNDER_CONSTRUCTION)
+                .target(ProjectStatusEnum.OPERATION)
                 .event(ProjectStatusChangeEvent.PURCHASE_PUT_ON_RECORD).and()
+
+                // 待开工 实施，从实施到建设中
+                .withExternal()
+                .source(ProjectStatusEnum.OPERATION)
+                .target(ProjectStatusEnum.UNDER_CONSTRUCTION)
+                .event(ProjectStatusChangeEvent.START_TO_WORK).and()
                 // 建设中初验备案，从建设中到待终验
                 .withExternal()
                 .source(ProjectStatusEnum.UNDER_CONSTRUCTION)

pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/builder/ProjectDeclareStateMachineKFQBuilder.java

@@ -211,11 +211,17 @@ public class ProjectDeclareStateMachineKFQBuilder implements ProjectDeclareState
                 .source(ProjectStatusEnum.TO_BE_APPROVED)
                 .target(ProjectStatusEnum.TO_BE_PURCHASED)
                 .event(ProjectStatusChangeEvent.PROJECT_APPROVAL).and()
-                // 待采购采购备案，从待采购到建设中
+                // 待采购采购备案，从待采购到实施中
                 .withExternal()
                 .source(ProjectStatusEnum.TO_BE_PURCHASED)
-                .target(ProjectStatusEnum.UNDER_CONSTRUCTION)
+                .target(ProjectStatusEnum.OPERATION)
                 .event(ProjectStatusChangeEvent.PURCHASE_PUT_ON_RECORD).and()
+
+                // 待开工 实施，从实施到建设中
+                .withExternal()
+                .source(ProjectStatusEnum.OPERATION)
+                .target(ProjectStatusEnum.UNDER_CONSTRUCTION)
+                .event(ProjectStatusChangeEvent.START_TO_WORK).and()
                 // 建设中初验备案，从建设中到待终验
                 .withExternal()
                 .source(ProjectStatusEnum.UNDER_CONSTRUCTION)

pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/builder/ProjectDeclareStateMachineLDBuilder.java

@@ -211,11 +211,17 @@ public class ProjectDeclareStateMachineLDBuilder implements ProjectDeclareStateM
                 .source(ProjectStatusEnum.TO_BE_APPROVED)
                 .target(ProjectStatusEnum.TO_BE_PURCHASED)
                 .event(ProjectStatusChangeEvent.PROJECT_APPROVAL).and()
-                // 待采购采购备案，从待采购到建设中
+                // 待采购采购备案，从待采购到实施中
                 .withExternal()
                 .source(ProjectStatusEnum.TO_BE_PURCHASED)
-                .target(ProjectStatusEnum.UNDER_CONSTRUCTION)
+                .target(ProjectStatusEnum.OPERATION)
                 .event(ProjectStatusChangeEvent.PURCHASE_PUT_ON_RECORD).and()
+
+                // 待开工 实施，从实施到建设中
+                .withExternal()
+                .source(ProjectStatusEnum.OPERATION)
+                .target(ProjectStatusEnum.UNDER_CONSTRUCTION)
+                .event(ProjectStatusChangeEvent.START_TO_WORK).and()
                 // 建设中初验备案，从建设中到待终验
                 .withExternal()
                 .source(ProjectStatusEnum.UNDER_CONSTRUCTION)

pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/builder/ProjectDeclareStateMachineLQBuilder.java

@@ -212,11 +212,17 @@ public class ProjectDeclareStateMachineLQBuilder implements ProjectDeclareStateM
                 .source(ProjectStatusEnum.TO_BE_APPROVED)
                 .target(ProjectStatusEnum.TO_BE_PURCHASED)
                 .event(ProjectStatusChangeEvent.PROJECT_APPROVAL).and()
-                // 待采购采购备案，从待采购到建设中
+                // 待采购采购备案，从待采购到实施中
                 .withExternal()
                 .source(ProjectStatusEnum.TO_BE_PURCHASED)
-                .target(ProjectStatusEnum.UNDER_CONSTRUCTION)
+                .target(ProjectStatusEnum.OPERATION)
                 .event(ProjectStatusChangeEvent.PURCHASE_PUT_ON_RECORD).and()
+
+                // 待开工 实施，从实施到建设中
+                .withExternal()
+                .source(ProjectStatusEnum.OPERATION)
+                .target(ProjectStatusEnum.UNDER_CONSTRUCTION)
+                .event(ProjectStatusChangeEvent.START_TO_WORK).and()
                 // 建设中初验备案，从建设中到待终验
                 .withExternal()
                 .source(ProjectStatusEnum.UNDER_CONSTRUCTION)

pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/builder/ProjectDeclareStateMachineQTBuilder.java

@@ -211,11 +211,17 @@ public class ProjectDeclareStateMachineQTBuilder implements ProjectDeclareStateM
                 .source(ProjectStatusEnum.TO_BE_APPROVED)
                 .target(ProjectStatusEnum.TO_BE_PURCHASED)
                 .event(ProjectStatusChangeEvent.PROJECT_APPROVAL).and()
-                // 待采购采购备案，从待采购到建设中
+                // 待采购采购备案，从待采购到实施中
                 .withExternal()
                 .source(ProjectStatusEnum.TO_BE_PURCHASED)
-                .target(ProjectStatusEnum.UNDER_CONSTRUCTION)
+                .target(ProjectStatusEnum.OPERATION)
                 .event(ProjectStatusChangeEvent.PURCHASE_PUT_ON_RECORD).and()
+
+                // 待开工 实施，从实施到建设中
+                .withExternal()
+                .source(ProjectStatusEnum.OPERATION)
+                .target(ProjectStatusEnum.UNDER_CONSTRUCTION)
+                .event(ProjectStatusChangeEvent.START_TO_WORK).and()
                 // 建设中初验备案，从建设中到待终验
                 .withExternal()
                 .source(ProjectStatusEnum.UNDER_CONSTRUCTION)

pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/builder/ProjectDeclareStateMachineQYBuilder.java

@@ -211,11 +211,17 @@ public class ProjectDeclareStateMachineQYBuilder implements ProjectDeclareStateM
                 .source(ProjectStatusEnum.TO_BE_APPROVED)
                 .target(ProjectStatusEnum.TO_BE_PURCHASED)
                 .event(ProjectStatusChangeEvent.PROJECT_APPROVAL).and()
-                // 待采购采购备案，从待采购到建设中
+                // 待采购采购备案，从待采购到实施中
                 .withExternal()
                 .source(ProjectStatusEnum.TO_BE_PURCHASED)
-                .target(ProjectStatusEnum.UNDER_CONSTRUCTION)
+                .target(ProjectStatusEnum.OPERATION)
                 .event(ProjectStatusChangeEvent.PURCHASE_PUT_ON_RECORD).and()
+
+                // 待开工 实施，从实施到建设中
+                .withExternal()
+                .source(ProjectStatusEnum.OPERATION)
+                .target(ProjectStatusEnum.UNDER_CONSTRUCTION)
+                .event(ProjectStatusChangeEvent.START_TO_WORK).and()
                 // 建设中初验备案，从建设中到待终验
                 .withExternal()
                 .source(ProjectStatusEnum.UNDER_CONSTRUCTION)

pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/builder/ProjectDeclareStateMachineSBJBuilder.java

@@ -212,11 +212,17 @@ public class ProjectDeclareStateMachineSBJBuilder implements ProjectDeclareState
                 .source(ProjectStatusEnum.TO_BE_APPROVED)
                 .target(ProjectStatusEnum.TO_BE_PURCHASED)
                 .event(ProjectStatusChangeEvent.PROJECT_APPROVAL).and()
-                // 待采购采购备案，从待采购到建设中
+                // 待采购采购备案，从待采购到实施中
                 .withExternal()
                 .source(ProjectStatusEnum.TO_BE_PURCHASED)
-                .target(ProjectStatusEnum.UNDER_CONSTRUCTION)
+                .target(ProjectStatusEnum.OPERATION)
                 .event(ProjectStatusChangeEvent.PURCHASE_PUT_ON_RECORD).and()
+
+                // 待开工 实施，从实施到建设中
+                .withExternal()
+                .source(ProjectStatusEnum.OPERATION)
+                .target(ProjectStatusEnum.UNDER_CONSTRUCTION)
+                .event(ProjectStatusChangeEvent.START_TO_WORK).and()
                 // 建设中初验备案，从建设中到待终验
                 .withExternal()
                 .source(ProjectStatusEnum.UNDER_CONSTRUCTION)

pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/builder/ProjectDeclareStateMachineSCBuilder.java

@@ -221,11 +221,17 @@ public class ProjectDeclareStateMachineSCBuilder implements ProjectDeclareStateM
                 .source(ProjectStatusEnum.TO_BE_APP_REGISTER)
                 .target(ProjectStatusEnum.TO_BE_PURCHASED)
                 .event(ProjectStatusChangeEvent.REGISTER_APP).and()
-                // 待采购采购备案，从待采购到建设中
+                // 待采购采购备案，从待采购到实施中
                 .withExternal()
                 .source(ProjectStatusEnum.TO_BE_PURCHASED)
-                .target(ProjectStatusEnum.UNDER_CONSTRUCTION)
+                .target(ProjectStatusEnum.OPERATION)
                 .event(ProjectStatusChangeEvent.PURCHASE_PUT_ON_RECORD).and()
+
+                // 待开工 实施，从实施到建设中
+                .withExternal()
+                .source(ProjectStatusEnum.OPERATION)
+                .target(ProjectStatusEnum.UNDER_CONSTRUCTION)
+                .event(ProjectStatusChangeEvent.START_TO_WORK).and()
                 // 建设中初验备案，从建设中到待终验
                 .withExternal()
                 .source(ProjectStatusEnum.UNDER_CONSTRUCTION)

pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/builder/ProjectDeclareStateMachineSYBuilder.java

@@ -211,11 +211,17 @@ public class ProjectDeclareStateMachineSYBuilder implements ProjectDeclareStateM
                 .source(ProjectStatusEnum.TO_BE_APPROVED)
                 .target(ProjectStatusEnum.TO_BE_PURCHASED)
                 .event(ProjectStatusChangeEvent.PROJECT_APPROVAL).and()
-                // 待采购采购备案，从待采购到建设中
+                // 待采购采购备案，从待采购到实施中
                 .withExternal()
                 .source(ProjectStatusEnum.TO_BE_PURCHASED)
-                .target(ProjectStatusEnum.UNDER_CONSTRUCTION)
+                .target(ProjectStatusEnum.OPERATION)
                 .event(ProjectStatusChangeEvent.PURCHASE_PUT_ON_RECORD).and()
+
+                // 待开工 实施，从实施到建设中
+                .withExternal()
+                .source(ProjectStatusEnum.OPERATION)
+                .target(ProjectStatusEnum.UNDER_CONSTRUCTION)
+                .event(ProjectStatusChangeEvent.START_TO_WORK).and()
                 // 建设中初验备案，从建设中到待终验
                 .withExternal()
                 .source(ProjectStatusEnum.UNDER_CONSTRUCTION)

pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/builder/ProjectDeclareStateMachineYHBuilder.java

@@ -211,11 +211,17 @@ public class ProjectDeclareStateMachineYHBuilder implements ProjectDeclareStateM
                 .source(ProjectStatusEnum.TO_BE_APPROVED)
                 .target(ProjectStatusEnum.TO_BE_PURCHASED)
                 .event(ProjectStatusChangeEvent.PROJECT_APPROVAL).and()
-                // 待采购采购备案，从待采购到建设中
+                // 待采购采购备案，从待采购到实施中
                 .withExternal()
                 .source(ProjectStatusEnum.TO_BE_PURCHASED)
-                .target(ProjectStatusEnum.UNDER_CONSTRUCTION)
+                .target(ProjectStatusEnum.OPERATION)
                 .event(ProjectStatusChangeEvent.PURCHASE_PUT_ON_RECORD).and()
+
+                // 待开工 实施，从实施到建设中
+                .withExternal()
+                .source(ProjectStatusEnum.OPERATION)
+                .target(ProjectStatusEnum.UNDER_CONSTRUCTION)
+                .event(ProjectStatusChangeEvent.START_TO_WORK).and()
                 // 建设中初验备案，从建设中到待终验
                 .withExternal()
                 .source(ProjectStatusEnum.UNDER_CONSTRUCTION)