From c8b29de51d2002dd5ec37cd0a0b7406075766b74 Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Thu, 9 Nov 2023 10:48:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=9F=A5=E6=B8=85=E5=8D=95=20?=
 =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E5=8C=B9=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manage/ReviewChecklistManage.java                | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ReviewChecklistManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ReviewChecklistManage.java
index d5c5529..218663b 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ReviewChecklistManage.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ReviewChecklistManage.java
@@ -368,13 +368,19 @@ public class ReviewChecklistManage {
                 .collect(Collectors.toList());
         return dupSubTitle.stream()
                 .map(r -> {
-                    ReviewChecklistModuleDto vo = BeanUtil.copyProperties(r,ReviewChecklistModuleDto.class);
+                    ReviewChecklistModuleDto vo = new ReviewChecklistModuleDto();
                     vo.setSubTitle(r.getSubTitle());
+                    vo.setContent(r.getContent());
+                    vo.setReviewComments(r.getReviewComments());
+                    vo.setReviewResult(ReviewChecklistResultEnum.match(r.getReviewResult()));
+                    vo.setRejectionSituation(r.getRejectionSituation());
+                    vo.setResponseSituation(r.getResponseSituation());
+                    vo.setCorrPageNum(r.getCorrPageNum());
                     if(groupSubTitleMap.containsKey(r.getSubTitle())){
                         List<ReviewChecklistApprove> approves = groupSubTitleMap.get(r.getSubTitle());
                         StringBuffer reviewCommentsSb = new StringBuffer();
 
-                        for(ReviewChecklistApprove approve : reviewChecklistApproves){
+                        for(ReviewChecklistApprove approve : approves){
                             reviewCommentsSb.append(approve.getCreateBy() + StrPool.COLON + approve.getReviewComments() + "\n");
                         }
                         vo.setReviewComments(reviewCommentsSb.toString());
@@ -394,15 +400,21 @@ public class ReviewChecklistManage {
                 .collect(Collectors.toList());
         return dupSubTitle.stream()
                 .map(r -> {
-                    ReviewChecklistModuleDto vo = BeanUtil.copyProperties(r,ReviewChecklistModuleDto.class);
+                    ReviewChecklistModuleDto vo = new ReviewChecklistModuleDto();
                     vo.setSubTitle(r.getSubTitle());
+                    vo.setContent(r.getContent());
+                    vo.setReviewComments(r.getReviewComments());
+                    vo.setReviewResult(ReviewChecklistResultEnum.match(r.getReviewResult()));
+                    vo.setRejectionSituation(r.getRejectionSituation());
+                    vo.setResponseSituation(r.getResponseSituation());
+                    vo.setCorrPageNum(r.getCorrPageNum());
                     if(groupSubTitleMap.containsKey(r.getSubTitle())){
                         List<ReviewChecklistApprove> approves = groupSubTitleMap.get(r.getSubTitle());
                         StringBuffer reviewCommentsSb = new StringBuffer();
                         if(CollUtil.isEmpty(approves)){
                             vo.setReviewComments("通过");
                         }else{
-                            for(ReviewChecklistApprove approve : reviewChecklistApproves){
+                            for(ReviewChecklistApprove approve : approves){
                                 reviewCommentsSb.append(approve.getCreateBy() + StrPool.COLON + approve.getReviewComments() + "\n");
                             }
                             vo.setReviewComments(reviewCommentsSb.toString());