测试报告-去掉目标分处理/各课程目标平均分处理过程

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/TRExamStudentServiceImpl.java

@@ -121,17 +121,8 @@ public class TRExamStudentServiceImpl extends ServiceImpl<TRExamStudentMapper, T
             ReportExamStudentDto reportExamStudentAvgDto = new ReportExamStudentDto("平均分", "平均分", null, score, targetDtoList);
             ReportExamStudentDto reportExamStudentTargetAvgDto = new ReportExamStudentDto("各课程目标平均分", "各课程目标平均分", null, null, targetDtoList);
 
-            //目标分处理
-//            this.targetScoreHandle(reportExamStudentTargetDto);
-            //各课程目标平均分处理
-//            this.targetAvgScoreHandle(reportExamStudentTargetAvgDto);
-
-            examStudentList.add(reportExamStudentTargetDto);
-            examStudentList.add(reportExamStudentAvgDto);
-            examStudentList.add(reportExamStudentTargetAvgDto);
-            trExamStudentList.add(new TRExamStudent(trBasicInfo.getId(), reportExamStudentTargetDto));
-            trExamStudentList.add(new TRExamStudent(trBasicInfo.getId(), reportExamStudentAvgDto));
-            trExamStudentList.add(new TRExamStudent(trBasicInfo.getId(), reportExamStudentTargetAvgDto));
+            examStudentList.addAll(Arrays.asList(reportExamStudentTargetDto, reportExamStudentAvgDto, reportExamStudentTargetAvgDto));
+            trExamStudentList.addAll(Arrays.asList(new TRExamStudent(trBasicInfo.getId(), reportExamStudentTargetDto), new TRExamStudent(trBasicInfo.getId(), reportExamStudentAvgDto), new TRExamStudent(trBasicInfo.getId(), reportExamStudentTargetAvgDto)));
             this.remove(new QueryWrapper<TRExamStudent>().lambda().eq(TRExamStudent::getrBasicInfoId, trBasicInfo.getId()));
             this.saveBatch(trExamStudentList);
         }
@@ -169,48 +160,4 @@ public class TRExamStudentServiceImpl extends ServiceImpl<TRExamStudentMapper, T
         Collections.sort(targetDtoList);
         return targetDtoList;
     }
-
-//    /**
-//     * 目标分处理
-//     *
-//     * @param reportExamStudentTargetDto
-//     */
-//    protected void targetScoreHandle(ReportExamStudentDto reportExamStudentTargetDto) {
-//        List<ReportExamStudentTargetDto> reportExamStudentTargetDtoList = reportExamStudentTargetDto.getTargetList();
-//        reportExamStudentTargetDtoList = reportExamStudentTargetDtoList.stream().map(ReportExamStudentTargetDto::new).collect(Collectors.toList());
-//        reportExamStudentTargetDtoList = reportExamStudentTargetDtoList.stream().peek(e -> {
-//            e.setTargetMatrixAvgScore(null);
-//            ReportExamStudentFinalScoreDto reportExamStudentFinalScoreDto = new ReportExamStudentFinalScoreDto(e.getFinalScore());
-//            List<DimensionDto> dimensionDtoList = reportExamStudentFinalScoreDto.getDimensionList().stream().map(DimensionDto::new).collect(Collectors.toList());
-//            reportExamStudentFinalScoreDto.setDimensionList(dimensionDtoList.stream().peek(s -> {
-//                s.setDimensionMatrixScore(null);
-//                s.setDimensionScore(null);
-//            }).collect(Collectors.toList()));
-//            e.setFinalScore(reportExamStudentFinalScoreDto);
-//
-//            ReportExamStudentUsualScoreDto reportExamStudentUsualScoreDto = new ReportExamStudentUsualScoreDto(e.getUsualScore());
-//            List<ReportExamStudentUsualScoreObjDto> reportExamStudentUsualScoreObjDtoList = reportExamStudentUsualScoreDto.getScoreList().stream().map(ReportExamStudentUsualScoreObjDto::new).collect(Collectors.toList());
-//            reportExamStudentUsualScoreObjDtoList.stream().peek(k -> {
-//                k.setScore(null);
-//                k.setMatrixAvgScore(null);
-//                k.setMatrixScore(null);
-//            }).collect(Collectors.toList());
-//            e.setUsualScore(reportExamStudentUsualScoreDto);
-//        }).collect(Collectors.toList());
-//        reportExamStudentTargetDto.setTargetList(reportExamStudentTargetDtoList);
-//    }
-//
-//    /**
-//     * 各课程目标平均分处理
-//     *
-//     * @param reportExamStudentTargetAvgDto
-//     */
-//    protected void targetAvgScoreHandle(ReportExamStudentDto reportExamStudentTargetAvgDto) {
-//        List<ReportExamStudentTargetDto> reportExamStudentTargetAvgDtoList = reportExamStudentTargetAvgDto.getTargetList();
-//        reportExamStudentTargetAvgDtoList = reportExamStudentTargetAvgDtoList.stream().map(ReportExamStudentTargetDto::new).collect(Collectors.toList()).stream().peek(e -> {
-//            e.setUsualScore(null);
-//            e.setFinalScore(null);
-//        }).collect(Collectors.toList());
-//        reportExamStudentTargetAvgDto.setTargetList(reportExamStudentTargetAvgDtoList);
-//    }
 }