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 d5c5529..218663b 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 @@ -368,13 +368,19 @@ public class ReviewChecklistManage { .collect(Collectors.toList()); return dupSubTitle.stream() .map(r -> { - ReviewChecklistModuleDto vo = BeanUtil.copyProperties(r,ReviewChecklistModuleDto.class); + ReviewChecklistModuleDto vo = new ReviewChecklistModuleDto(); 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())){ List approves = groupSubTitleMap.get(r.getSubTitle()); StringBuffer reviewCommentsSb = new StringBuffer(); - for(ReviewChecklistApprove approve : reviewChecklistApproves){ + for(ReviewChecklistApprove approve : approves){ reviewCommentsSb.append(approve.getCreateBy() + StrPool.COLON + approve.getReviewComments() + "\n"); } vo.setReviewComments(reviewCommentsSb.toString()); @@ -394,15 +400,21 @@ public class ReviewChecklistManage { .collect(Collectors.toList()); return dupSubTitle.stream() .map(r -> { - ReviewChecklistModuleDto vo = BeanUtil.copyProperties(r,ReviewChecklistModuleDto.class); + ReviewChecklistModuleDto vo = new ReviewChecklistModuleDto(); 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())){ List approves = groupSubTitleMap.get(r.getSubTitle()); StringBuffer reviewCommentsSb = new StringBuffer(); if(CollUtil.isEmpty(approves)){ vo.setReviewComments("通过"); }else{ - for(ReviewChecklistApprove approve : reviewChecklistApproves){ + for(ReviewChecklistApprove approve : approves){ reviewCommentsSb.append(approve.getCreateBy() + StrPool.COLON + approve.getReviewComments() + "\n"); } vo.setReviewComments(reviewCommentsSb.toString());