From 9cf80bc6d115d5aa2e79ac0434eac29a26c3d321 Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Tue, 1 Aug 2023 09:52:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E6=96=BD=E4=BF=A1=E6=81=AF=20?=
 =?UTF-8?q?=E6=94=BE=E5=85=A5=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pmapi/projectlib/manage/ProjectLibManage.java  | 23 +++++++++++-----------
 .../pmapi/projectlib/model/vo/ProjectDetailVO.java |  4 ++++
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java
index 810d0ab..6c9e029 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java
@@ -35,18 +35,9 @@ import com.ningdatech.pmapi.performance.model.dto.ProjectCoreBusinessDTO;
 import com.ningdatech.pmapi.performance.model.entity.ProjectCoreBusinessIndicators;
 import com.ningdatech.pmapi.performance.service.IProjectCoreBusinessIndicatorsService;
 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;
@@ -114,6 +105,8 @@ public class ProjectLibManage {
     private final ITodoService todoService;
     private final IProjectCoreBusinessIndicatorsService projectCoreBusinessIndicatorsService;
 
+    private final IOperationService operationService;
+
     public PageVo<ProjectLibListItemVO> projectLibList(ProjectListReq req) {
         LambdaQueryWrapper<Project> query = ProjectHelper.projectQuery(req);
         query.eq(Project::getNewest, Boolean.TRUE);
@@ -607,6 +600,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)
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectDetailVO.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectDetailVO.java
index 21ded6a..522efdb 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectDetailVO.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectDetailVO.java
@@ -7,6 +7,7 @@ import com.ningdatech.basic.util.NdDateUtils;
 import com.ningdatech.pmapi.common.util.BizUtils;
 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.ProjectTypeEnum;
@@ -374,6 +375,9 @@ public class ProjectDetailVO {
     @ApiModelProperty("初审人员")
     private List<PreInsAcceptancePersonVO> acceptancePersons;
 
+    @ApiModelProperty("实施信息")
+    private OperationVO operation;
+
     @ApiModelProperty("版本号str")
     private String versionStr;