Merge branch 'ls2_operation_0731' of http://git.ningdatech.com/liushuai/project-management into ls2_early_warning+safety_risk+portrait_0731

 Conflicts:

	pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java

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

@@ -214,7 +214,6 @@ public class ProjectDeclareAction {
         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);

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

@@ -211,7 +211,6 @@ public class ProjectDeclareJNAction {
         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);

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -210,7 +210,6 @@ public class ProjectDeclareYHAction {
         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);

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

@@ -216,6 +216,7 @@ public class ProjectDeclareStateMachineJNBuilder implements ProjectDeclareStateM
                 .source(ProjectStatusEnum.TO_BE_PURCHASED)
                 .target(ProjectStatusEnum.OPERATION)
                 .event(ProjectStatusChangeEvent.PURCHASE_PUT_ON_RECORD).and()
+
                 // 待开工 实施，从实施到建设中
                 .withExternal()
                 .source(ProjectStatusEnum.OPERATION)

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

@@ -216,6 +216,7 @@ public class ProjectDeclareStateMachineJYBuilder implements ProjectDeclareStateM
                 .source(ProjectStatusEnum.TO_BE_PURCHASED)
                 .target(ProjectStatusEnum.OPERATION)
                 .event(ProjectStatusChangeEvent.PURCHASE_PUT_ON_RECORD).and()
+
                 // 待开工 实施，从实施到建设中
                 .withExternal()
                 .source(ProjectStatusEnum.OPERATION)

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

@@ -216,6 +216,7 @@ public class ProjectDeclareStateMachineKFQBuilder implements ProjectDeclareState
                 .source(ProjectStatusEnum.TO_BE_PURCHASED)
                 .target(ProjectStatusEnum.OPERATION)
                 .event(ProjectStatusChangeEvent.PURCHASE_PUT_ON_RECORD).and()
+
                 // 待开工 实施，从实施到建设中
                 .withExternal()
                 .source(ProjectStatusEnum.OPERATION)

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

@@ -216,6 +216,7 @@ public class ProjectDeclareStateMachineLDBuilder implements ProjectDeclareStateM
                 .source(ProjectStatusEnum.TO_BE_PURCHASED)
                 .target(ProjectStatusEnum.OPERATION)
                 .event(ProjectStatusChangeEvent.PURCHASE_PUT_ON_RECORD).and()
+
                 // 待开工 实施，从实施到建设中
                 .withExternal()
                 .source(ProjectStatusEnum.OPERATION)

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

@@ -217,6 +217,7 @@ public class ProjectDeclareStateMachineLQBuilder implements ProjectDeclareStateM
                 .source(ProjectStatusEnum.TO_BE_PURCHASED)
                 .target(ProjectStatusEnum.OPERATION)
                 .event(ProjectStatusChangeEvent.PURCHASE_PUT_ON_RECORD).and()
+
                 // 待开工 实施，从实施到建设中
                 .withExternal()
                 .source(ProjectStatusEnum.OPERATION)

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

@@ -216,6 +216,7 @@ public class ProjectDeclareStateMachineQTBuilder implements ProjectDeclareStateM
                 .source(ProjectStatusEnum.TO_BE_PURCHASED)
                 .target(ProjectStatusEnum.OPERATION)
                 .event(ProjectStatusChangeEvent.PURCHASE_PUT_ON_RECORD).and()
+
                 // 待开工 实施，从实施到建设中
                 .withExternal()
                 .source(ProjectStatusEnum.OPERATION)

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

@@ -216,6 +216,7 @@ public class ProjectDeclareStateMachineQYBuilder implements ProjectDeclareStateM
                 .source(ProjectStatusEnum.TO_BE_PURCHASED)
                 .target(ProjectStatusEnum.OPERATION)
                 .event(ProjectStatusChangeEvent.PURCHASE_PUT_ON_RECORD).and()
+
                 // 待开工 实施，从实施到建设中
                 .withExternal()
                 .source(ProjectStatusEnum.OPERATION)

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

@@ -217,6 +217,7 @@ public class ProjectDeclareStateMachineSBJBuilder implements ProjectDeclareState
                 .source(ProjectStatusEnum.TO_BE_PURCHASED)
                 .target(ProjectStatusEnum.OPERATION)
                 .event(ProjectStatusChangeEvent.PURCHASE_PUT_ON_RECORD).and()
+
                 // 待开工 实施，从实施到建设中
                 .withExternal()
                 .source(ProjectStatusEnum.OPERATION)

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

@@ -226,6 +226,7 @@ public class ProjectDeclareStateMachineSCBuilder implements ProjectDeclareStateM
                 .source(ProjectStatusEnum.TO_BE_PURCHASED)
                 .target(ProjectStatusEnum.OPERATION)
                 .event(ProjectStatusChangeEvent.PURCHASE_PUT_ON_RECORD).and()
+
                 // 待开工 实施，从实施到建设中
                 .withExternal()
                 .source(ProjectStatusEnum.OPERATION)

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

@@ -216,6 +216,7 @@ public class ProjectDeclareStateMachineSYBuilder implements ProjectDeclareStateM
                 .source(ProjectStatusEnum.TO_BE_PURCHASED)
                 .target(ProjectStatusEnum.OPERATION)
                 .event(ProjectStatusChangeEvent.PURCHASE_PUT_ON_RECORD).and()
+
                 // 待开工 实施，从实施到建设中
                 .withExternal()
                 .source(ProjectStatusEnum.OPERATION)

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

@@ -216,6 +216,7 @@ public class ProjectDeclareStateMachineYHBuilder implements ProjectDeclareStateM
                 .source(ProjectStatusEnum.TO_BE_PURCHASED)
                 .target(ProjectStatusEnum.OPERATION)
                 .event(ProjectStatusChangeEvent.PURCHASE_PUT_ON_RECORD).and()
+
                 // 待开工 实施，从实施到建设中
                 .withExternal()
                 .source(ProjectStatusEnum.OPERATION)

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java

@@ -41,18 +41,9 @@ import com.ningdatech.pmapi.portrait.model.vo.TagVO;
 import com.ningdatech.pmapi.portrait.service.IProjectTagService;
 import com.ningdatech.pmapi.portrait.service.ITagService;
 import com.ningdatech.pmapi.projectdeclared.model.dto.DelayedApplyDTO;
-import com.ningdatech.pmapi.projectdeclared.model.entity.Contract;
-import com.ningdatech.pmapi.projectdeclared.model.entity.PaymentPlan;
-import com.ningdatech.pmapi.projectdeclared.model.entity.PreInsAcceptancePerson;
-import com.ningdatech.pmapi.projectdeclared.model.entity.Purchase;
-import com.ningdatech.pmapi.projectdeclared.model.vo.ContractVO;
-import com.ningdatech.pmapi.projectdeclared.model.vo.PaymentPlanVO;
-import com.ningdatech.pmapi.projectdeclared.model.vo.PreInsAcceptancePersonVO;
-import com.ningdatech.pmapi.projectdeclared.model.vo.PurchaseVO;
-import com.ningdatech.pmapi.projectdeclared.service.IContractService;
-import com.ningdatech.pmapi.projectdeclared.service.IPaymentPlanService;
-import com.ningdatech.pmapi.projectdeclared.service.IPreInsAcceptancePersonService;
-import com.ningdatech.pmapi.projectdeclared.service.IPurchaseService;
+import com.ningdatech.pmapi.projectdeclared.model.entity.*;
+import com.ningdatech.pmapi.projectdeclared.model.vo.*;
+import com.ningdatech.pmapi.projectdeclared.service.*;
 import com.ningdatech.pmapi.projectdeclared.utils.GenerateProjectCodeUtil;
 import com.ningdatech.pmapi.projectlib.constant.ProjectConstant;
 import com.ningdatech.pmapi.projectlib.enumeration.InstTypeEnum;
@@ -123,6 +114,8 @@ public class ProjectLibManage {
     private final IProjectTagService projectTagService;
     private final ITagService tagService;
 
+    private final IOperationService operationService;
+
     public PageVo<ProjectLibListItemVO> projectLibList(ProjectListReq req) {
         LambdaQueryWrapper<Project> query = ProjectHelper.projectQuery(req);
         query.eq(Project::getNewest, Boolean.TRUE);
@@ -790,6 +783,12 @@ public class ProjectLibManage {
                     contractVO.getTotalAmount()));
         }
 
+        //查询实施信息
+        Operation operation = operationService.getOne(Wrappers.lambdaQuery(Operation.class)
+                .in(Operation::getProjectId, allVersionProjectId)
+                .orderByAsc(Operation::getCreateOn)
+                .last(BizConst.LIMIT_1));
+        vo.setOperation(BeanUtil.copyProperties(operation, OperationVO.class));
 
         //查询初验信息
         List<PreInsAcceptancePerson> acceptancePersons = acceptancePersonService.list(Wrappers.lambdaQuery(PreInsAcceptancePerson.class)

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectDetailVO.java

@@ -8,6 +8,7 @@ import com.ningdatech.pmapi.common.util.BizUtils;
 import com.ningdatech.pmapi.portrait.model.vo.TagVO;
 import com.ningdatech.pmapi.projectdeclared.model.entity.Contract;
 import com.ningdatech.pmapi.projectdeclared.model.vo.ContractVO;
+import com.ningdatech.pmapi.projectdeclared.model.vo.OperationVO;
 import com.ningdatech.pmapi.projectdeclared.model.vo.PreInsAcceptancePersonVO;
 import com.ningdatech.pmapi.projectdeclared.model.vo.PurchaseVO;
 import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum;
@@ -376,6 +377,9 @@ public class ProjectDetailVO {
     @ApiModelProperty("初审人员")
     private List<PreInsAcceptancePersonVO> acceptancePersons;
 
+    @ApiModelProperty("实施信息")
+    private OperationVO operation;
+
     @ApiModelProperty("版本号str")
     private String versionStr;