|
@@ -372,7 +372,8 @@ 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()); |
|
|
vo.setReviewResult(ReviewChecklistResultEnum.match(r.getReviewResult())); |
|
|
|
|
|
|
|
|
ReviewChecklistResultEnum match = ReviewChecklistResultEnum.match(r.getReviewResult()); |
|
|
|
|
|
vo.setReviewResult(match); |
|
|
vo.setRejectionSituation(r.getRejectionSituation()); |
|
|
vo.setRejectionSituation(r.getRejectionSituation()); |
|
|
vo.setResponseSituation(r.getResponseSituation()); |
|
|
vo.setResponseSituation(r.getResponseSituation()); |
|
|
vo.setCorrPageNum(r.getCorrPageNum()); |
|
|
vo.setCorrPageNum(r.getCorrPageNum()); |
|
@@ -381,7 +382,8 @@ public class ReviewChecklistManage { |
|
|
StringBuffer reviewCommentsSb = new StringBuffer(); |
|
|
StringBuffer reviewCommentsSb = new StringBuffer(); |
|
|
|
|
|
|
|
|
for(ReviewChecklistApprove approve : approves){ |
|
|
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()); |
|
|
vo.setReviewComments(reviewCommentsSb.toString()); |
|
|
} |
|
|
} |
|
@@ -404,7 +406,8 @@ 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()); |
|
|
vo.setReviewResult(ReviewChecklistResultEnum.match(r.getReviewResult())); |
|
|
|
|
|
|
|
|
ReviewChecklistResultEnum match = ReviewChecklistResultEnum.match(r.getReviewResult()); |
|
|
|
|
|
vo.setReviewResult(match); |
|
|
vo.setRejectionSituation(r.getRejectionSituation()); |
|
|
vo.setRejectionSituation(r.getRejectionSituation()); |
|
|
vo.setResponseSituation(r.getResponseSituation()); |
|
|
vo.setResponseSituation(r.getResponseSituation()); |
|
|
vo.setCorrPageNum(r.getCorrPageNum()); |
|
|
vo.setCorrPageNum(r.getCorrPageNum()); |
|
@@ -414,8 +417,11 @@ public class ReviewChecklistManage { |
|
|
if(CollUtil.isEmpty(approves)){ |
|
|
if(CollUtil.isEmpty(approves)){ |
|
|
vo.setReviewComments("通过"); |
|
|
vo.setReviewComments("通过"); |
|
|
}else{ |
|
|
}else{ |
|
|
|
|
|
Integer index = 1; |
|
|
for(ReviewChecklistApprove approve : approves){ |
|
|
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()); |
|
|
vo.setReviewComments(reviewCommentsSb.toString()); |
|
|
} |
|
|
} |
|
|