Browse Source

审查清单 枚举匹配

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

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

@@ -368,13 +368,19 @@ public class ReviewChecklistManage {
.collect(Collectors.toList()); .collect(Collectors.toList());
return dupSubTitle.stream() return dupSubTitle.stream()
.map(r -> { .map(r -> {
ReviewChecklistModuleDto vo = BeanUtil.copyProperties(r,ReviewChecklistModuleDto.class);
ReviewChecklistModuleDto vo = new ReviewChecklistModuleDto();
vo.setSubTitle(r.getSubTitle()); vo.setSubTitle(r.getSubTitle());
vo.setContent(r.getContent());
vo.setReviewComments(r.getReviewComments());
vo.setReviewResult(ReviewChecklistResultEnum.match(r.getReviewResult()));
vo.setRejectionSituation(r.getRejectionSituation());
vo.setResponseSituation(r.getResponseSituation());
vo.setCorrPageNum(r.getCorrPageNum());
if(groupSubTitleMap.containsKey(r.getSubTitle())){ if(groupSubTitleMap.containsKey(r.getSubTitle())){
List<ReviewChecklistApprove> approves = groupSubTitleMap.get(r.getSubTitle()); List<ReviewChecklistApprove> approves = groupSubTitleMap.get(r.getSubTitle());
StringBuffer reviewCommentsSb = new StringBuffer(); StringBuffer reviewCommentsSb = new StringBuffer();


for(ReviewChecklistApprove approve : reviewChecklistApproves){
for(ReviewChecklistApprove approve : approves){
reviewCommentsSb.append(approve.getCreateBy() + StrPool.COLON + approve.getReviewComments() + "\n"); reviewCommentsSb.append(approve.getCreateBy() + StrPool.COLON + approve.getReviewComments() + "\n");
} }
vo.setReviewComments(reviewCommentsSb.toString()); vo.setReviewComments(reviewCommentsSb.toString());
@@ -394,15 +400,21 @@ public class ReviewChecklistManage {
.collect(Collectors.toList()); .collect(Collectors.toList());
return dupSubTitle.stream() return dupSubTitle.stream()
.map(r -> { .map(r -> {
ReviewChecklistModuleDto vo = BeanUtil.copyProperties(r,ReviewChecklistModuleDto.class);
ReviewChecklistModuleDto vo = new ReviewChecklistModuleDto();
vo.setSubTitle(r.getSubTitle()); vo.setSubTitle(r.getSubTitle());
vo.setContent(r.getContent());
vo.setReviewComments(r.getReviewComments());
vo.setReviewResult(ReviewChecklistResultEnum.match(r.getReviewResult()));
vo.setRejectionSituation(r.getRejectionSituation());
vo.setResponseSituation(r.getResponseSituation());
vo.setCorrPageNum(r.getCorrPageNum());
if(groupSubTitleMap.containsKey(r.getSubTitle())){ if(groupSubTitleMap.containsKey(r.getSubTitle())){
List<ReviewChecklistApprove> approves = groupSubTitleMap.get(r.getSubTitle()); List<ReviewChecklistApprove> approves = groupSubTitleMap.get(r.getSubTitle());
StringBuffer reviewCommentsSb = new StringBuffer(); StringBuffer reviewCommentsSb = new StringBuffer();
if(CollUtil.isEmpty(approves)){ if(CollUtil.isEmpty(approves)){
vo.setReviewComments("通过"); vo.setReviewComments("通过");
}else{ }else{
for(ReviewChecklistApprove approve : reviewChecklistApproves){
for(ReviewChecklistApprove approve : approves){
reviewCommentsSb.append(approve.getCreateBy() + StrPool.COLON + approve.getReviewComments() + "\n"); reviewCommentsSb.append(approve.getCreateBy() + StrPool.COLON + approve.getReviewComments() + "\n");
} }
vo.setReviewComments(reviewCommentsSb.toString()); vo.setReviewComments(reviewCommentsSb.toString());


Loading…
Cancel
Save