From 4e485558fe06a81c43ec6dc8ea93ed5f21d43067 Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Fri, 10 Nov 2023 14:39:23 +0800
Subject: [PATCH] =?UTF-8?q?debug=20=E5=90=88=E5=B9=B6=E5=AE=A1=E6=9F=A5?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pmapi/projectdeclared/manage/ReviewChecklistManage.java       | 8 ++++----
 1 file changed, 4 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 d758093..a20a471 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
@@ -296,8 +296,8 @@ public class ReviewChecklistManage {
         Map<String, List<ReviewChecklistApprove>> groupTitleMap = approves.stream()
                 .collect(Collectors.groupingBy(ReviewChecklistApprove::getTitle));
         //去重标题
-        Set<String> subTitleSet = Sets.newHashSet();
-        List<ReviewChecklistApprove> dupTitle = approves.stream().filter(r -> subTitleSet.add(r.getTitle()))
+        Set<String> titleSet = Sets.newHashSet();
+        List<ReviewChecklistApprove> dupTitle = approves.stream().filter(r -> titleSet.add(r.getTitle()))
                 .collect(Collectors.toList());
 
         List<FormsReviewChecklistDto> res = dupTitle.stream()
@@ -388,7 +388,6 @@ public class ReviewChecklistManage {
                     vo.setSubTitle(r.getSubTitle());
                     vo.setContent(r.getContent());
                     vo.setReviewComments(r.getReviewComments());
-                    ReviewChecklistResultEnum match = ReviewChecklistResultEnum.match(r.getReviewResult());
                     vo.setRejectionSituation(r.getRejectionSituation());
                     vo.setResponseSituation(r.getResponseSituation());
                     vo.setCorrPageNum(r.getCorrPageNum());
@@ -397,6 +396,7 @@ public class ReviewChecklistManage {
                         StringBuffer reviewCommentsSb = new StringBuffer();
 
                         for(ReviewChecklistApprove approve : approves){
+                            ReviewChecklistResultEnum match = ReviewChecklistResultEnum.match(approve.getReviewResult());
                             reviewCommentsSb.append(approve.getCreateBy() + StrPool.COLON + (Objects.nonNull(match)?match.getDesc():StringUtils.EMPTY) +
                                     (StringUtils.isNotBlank(approve.getReviewComments())?StrPool.COMMA+approve.getReviewComments():StringUtils.EMPTY) + "\n");
                         }
@@ -421,7 +421,6 @@ public class ReviewChecklistManage {
                     vo.setSubTitle(r.getSubTitle());
                     vo.setContent(r.getContent());
                     vo.setReviewComments(r.getReviewComments());
-                    ReviewChecklistResultEnum match = ReviewChecklistResultEnum.match(r.getReviewResult());
                     vo.setRejectionSituation(r.getRejectionSituation());
                     vo.setResponseSituation(r.getResponseSituation());
                     vo.setCorrPageNum(r.getCorrPageNum());
@@ -433,6 +432,7 @@ public class ReviewChecklistManage {
                         }else{
                             Integer index = 1;
                             for(ReviewChecklistApprove approve : approves){
+                                ReviewChecklistResultEnum match = ReviewChecklistResultEnum.match(approve.getReviewResult());
                                 reviewCommentsSb.append(index + StrPool.DOT + (Objects.nonNull(match)?match.getDesc():StringUtils.EMPTY) +
                                         (StringUtils.isNotBlank(approve.getReviewComments())?StrPool.COMMA+approve.getReviewComments():StringUtils.EMPTY) + "\n");
                                 index++;