From d89822073e94f1d49ffb3193d500eb8123996ec5 Mon Sep 17 00:00:00 2001
From: dxc <jl-daixc@chinaunicom.cn>
Date: Wed, 28 Jul 2021 16:48:38 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=96=B0=E8=AF=84=E5=AE=A1=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=90=8C=E6=AD=A5=E8=AF=84=E5=AE=A1=E5=88=86=E5=B7=A5?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E6=97=B6=E9=97=B4=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=EF=BC=88=E5=BC=80=E5=A7=8B=E6=97=B6=E9=97=B4=EF=BC=8C?=
 =?UTF-8?q?=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chinaunicom/mall/ebtp/project/feign/EbtpRsmsApi.java   | 7 ++++++-
 .../service/impl/ProjectReEvaluationServiceImpl.java       | 3 ++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/EbtpRsmsApi.java b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/EbtpRsmsApi.java
index 1973e6c..5a1c1f2 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/project/feign/EbtpRsmsApi.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/project/feign/EbtpRsmsApi.java
@@ -8,6 +8,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
@@ -31,11 +32,15 @@ public interface EbtpRsmsApi {
      * 复制评委会成员信息
      * @param oldRoomId 被复制的评审室ID
      * @param newRoomId 新的评审室ID
+     * @param startTime 开始时间
+     * @param endTime 结束时间
      * @return 返回结果
      */
     @GetMapping("/v1/jury/copy")
     BaseResponse<Boolean> copyJury(@RequestParam(name = "oldRoomId") String oldRoomId,
-                                   @RequestParam(name = "newRoomId") String newRoomId);
+                                   @RequestParam(name = "newRoomId") String newRoomId,
+                                   @RequestParam(name = "startTime") LocalDateTime startTime,
+                                   @RequestParam(name = "endTime") LocalDateTime endTime);
 
     /**
      * 根据标段ID集合查询是否能够发起异常处理
diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/impl/ProjectReEvaluationServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/impl/ProjectReEvaluationServiceImpl.java
index fcc9e8b..237241d 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/impl/ProjectReEvaluationServiceImpl.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/impl/ProjectReEvaluationServiceImpl.java
@@ -418,7 +418,8 @@ public class ProjectReEvaluationServiceImpl extends BaseServiceImpl<ProjectReEva
 
         //是否专家与上次一致 如果 是 进行复制
         if(StringUtils.equals(ProjectCommonUtil.IS_AGREEMENT_YES,evaluation.getIsAgreement())){
-            BaseResponse<Boolean> juryResponse =  ebtpRsmsApi.copyJury(evaluation.getAssessId(),againRoomVO.getRoomId());
+            BaseResponse<Boolean> juryResponse =  ebtpRsmsApi.copyJury(evaluation.getAssessId(),againRoomVO.getRoomId(),
+                    evaluation.getEvaluationStartTime(),evaluation.getEvaluationEndTime());
             ProjectExceptionEnum.FRAME_EXCEPTION_ERROR.customValidName(juryResponse.getMessage(),!juryResponse.isSuccess());
         }