From 6a08b2be7ab34bdd6449cd5354bdc9df96fd1598 Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Thu, 9 Nov 2023 11:04:17 +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

---
 .../projectdeclared/manage/ReviewChecklistManage.java      | 14 ++++++++++----
 1 file changed, 10 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 218663b..1db5513 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
@@ -372,7 +372,8 @@ public class ReviewChecklistManage {
                     vo.setSubTitle(r.getSubTitle());
                     vo.setContent(r.getContent());
                     vo.setReviewComments(r.getReviewComments());
-                    vo.setReviewResult(ReviewChecklistResultEnum.match(r.getReviewResult()));
+                    ReviewChecklistResultEnum match = ReviewChecklistResultEnum.match(r.getReviewResult());
+                    vo.setReviewResult(match);
                     vo.setRejectionSituation(r.getRejectionSituation());
                     vo.setResponseSituation(r.getResponseSituation());
                     vo.setCorrPageNum(r.getCorrPageNum());
@@ -381,7 +382,8 @@ public class ReviewChecklistManage {
                         StringBuffer reviewCommentsSb = new StringBuffer();
 
                         for(ReviewChecklistApprove approve : approves){
-                            reviewCommentsSb.append(approve.getCreateBy() + StrPool.COLON + approve.getReviewComments() + "\n");
+                            reviewCommentsSb.append(approve.getCreateBy() + StrPool.COLON + (Objects.nonNull(match)?match.getDesc():StringUtils.EMPTY) +
+                                    (StringUtils.isNotBlank(approve.getReviewComments())?StrPool.COMMA+approve.getReviewComments():StringUtils.EMPTY) + "\n");
                         }
                         vo.setReviewComments(reviewCommentsSb.toString());
                     }
@@ -404,7 +406,8 @@ public class ReviewChecklistManage {
                     vo.setSubTitle(r.getSubTitle());
                     vo.setContent(r.getContent());
                     vo.setReviewComments(r.getReviewComments());
-                    vo.setReviewResult(ReviewChecklistResultEnum.match(r.getReviewResult()));
+                    ReviewChecklistResultEnum match = ReviewChecklistResultEnum.match(r.getReviewResult());
+                    vo.setReviewResult(match);
                     vo.setRejectionSituation(r.getRejectionSituation());
                     vo.setResponseSituation(r.getResponseSituation());
                     vo.setCorrPageNum(r.getCorrPageNum());
@@ -414,8 +417,11 @@ public class ReviewChecklistManage {
                         if(CollUtil.isEmpty(approves)){
                             vo.setReviewComments("通过");
                         }else{
+                            Integer index = 1;
                             for(ReviewChecklistApprove approve : approves){
-                                reviewCommentsSb.append(approve.getCreateBy() + StrPool.COLON + approve.getReviewComments() + "\n");
+                                reviewCommentsSb.append(index + StrPool.DOT + (Objects.nonNull(match)?match.getDesc():StringUtils.EMPTY) +
+                                        (StringUtils.isNotBlank(approve.getReviewComments())?StrPool.COMMA+approve.getReviewComments():StringUtils.EMPTY) + "\n");
+                                index++;
                             }
                             vo.setReviewComments(reviewCommentsSb.toString());
                         }