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> groupTitleMap = approves.stream() .collect(Collectors.groupingBy(ReviewChecklistApprove::getTitle)); //去重标题 - Set subTitleSet = Sets.newHashSet(); - List dupTitle = approves.stream().filter(r -> subTitleSet.add(r.getTitle())) + Set titleSet = Sets.newHashSet(); + List dupTitle = approves.stream().filter(r -> titleSet.add(r.getTitle())) .collect(Collectors.toList()); List 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++;