Browse Source

debug 合并审查清单的问题

tags/24080901
PoffyZhang 1 year ago
parent
commit
4e485558fe
1 changed files with 4 additions and 4 deletions
  1. +4
    -4
      pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ReviewChecklistManage.java

+ 4
- 4
pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/ReviewChecklistManage.java View File

@@ -296,8 +296,8 @@ public class ReviewChecklistManage {
Map<String, List<ReviewChecklistApprove>> groupTitleMap = approves.stream() Map<String, List<ReviewChecklistApprove>> groupTitleMap = approves.stream()
.collect(Collectors.groupingBy(ReviewChecklistApprove::getTitle)); .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()); .collect(Collectors.toList());


List<FormsReviewChecklistDto> res = dupTitle.stream() List<FormsReviewChecklistDto> res = dupTitle.stream()
@@ -388,7 +388,6 @@ public class ReviewChecklistManage {
vo.setSubTitle(r.getSubTitle()); vo.setSubTitle(r.getSubTitle());
vo.setContent(r.getContent()); vo.setContent(r.getContent());
vo.setReviewComments(r.getReviewComments()); vo.setReviewComments(r.getReviewComments());
ReviewChecklistResultEnum match = ReviewChecklistResultEnum.match(r.getReviewResult());
vo.setRejectionSituation(r.getRejectionSituation()); vo.setRejectionSituation(r.getRejectionSituation());
vo.setResponseSituation(r.getResponseSituation()); vo.setResponseSituation(r.getResponseSituation());
vo.setCorrPageNum(r.getCorrPageNum()); vo.setCorrPageNum(r.getCorrPageNum());
@@ -397,6 +396,7 @@ public class ReviewChecklistManage {
StringBuffer reviewCommentsSb = new StringBuffer(); StringBuffer reviewCommentsSb = new StringBuffer();


for(ReviewChecklistApprove approve : approves){ for(ReviewChecklistApprove approve : approves){
ReviewChecklistResultEnum match = ReviewChecklistResultEnum.match(approve.getReviewResult());
reviewCommentsSb.append(approve.getCreateBy() + StrPool.COLON + (Objects.nonNull(match)?match.getDesc():StringUtils.EMPTY) + reviewCommentsSb.append(approve.getCreateBy() + StrPool.COLON + (Objects.nonNull(match)?match.getDesc():StringUtils.EMPTY) +
(StringUtils.isNotBlank(approve.getReviewComments())?StrPool.COMMA+approve.getReviewComments():StringUtils.EMPTY) + "\n"); (StringUtils.isNotBlank(approve.getReviewComments())?StrPool.COMMA+approve.getReviewComments():StringUtils.EMPTY) + "\n");
} }
@@ -421,7 +421,6 @@ public class ReviewChecklistManage {
vo.setSubTitle(r.getSubTitle()); vo.setSubTitle(r.getSubTitle());
vo.setContent(r.getContent()); vo.setContent(r.getContent());
vo.setReviewComments(r.getReviewComments()); vo.setReviewComments(r.getReviewComments());
ReviewChecklistResultEnum match = ReviewChecklistResultEnum.match(r.getReviewResult());
vo.setRejectionSituation(r.getRejectionSituation()); vo.setRejectionSituation(r.getRejectionSituation());
vo.setResponseSituation(r.getResponseSituation()); vo.setResponseSituation(r.getResponseSituation());
vo.setCorrPageNum(r.getCorrPageNum()); vo.setCorrPageNum(r.getCorrPageNum());
@@ -433,6 +432,7 @@ public class ReviewChecklistManage {
}else{ }else{
Integer index = 1; Integer index = 1;
for(ReviewChecklistApprove approve : approves){ for(ReviewChecklistApprove approve : approves){
ReviewChecklistResultEnum match = ReviewChecklistResultEnum.match(approve.getReviewResult());
reviewCommentsSb.append(index + StrPool.DOT + (Objects.nonNull(match)?match.getDesc():StringUtils.EMPTY) + reviewCommentsSb.append(index + StrPool.DOT + (Objects.nonNull(match)?match.getDesc():StringUtils.EMPTY) +
(StringUtils.isNotBlank(approve.getReviewComments())?StrPool.COMMA+approve.getReviewComments():StringUtils.EMPTY) + "\n"); (StringUtils.isNotBlank(approve.getReviewComments())?StrPool.COMMA+approve.getReviewComments():StringUtils.EMPTY) + "\n");
index++; index++;


Loading…
Cancel
Save