测试报告

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

@@ -301,15 +301,15 @@ public class TRBasicInfoServiceImpl extends ServiceImpl<TRBasicInfoMapper, TRBas
                     reportEvaluationDtoList.add(reportEvaluationDto);
 
                     //课程目标-平时作业达成度计算
-                    if (Objects.nonNull(reportEvaluationDto.getWeight()) && reportEvaluationDto.getWeight().doubleValue() > 0d) {
-                        evaluationAvg = evaluationAvg.doubleValue() + reportEvaluationDto.getAvg();
-                        evaluationScore = evaluationScore.doubleValue() + reportEvaluationDto.getScore();
-                        evaluationWeight = evaluationWeight.add(reportEvaluationDto.getWeight());
-                        Map<String, BigDecimal> usualScoreWeight = v.getUsualScoreWeight();
-                        usualScoreWeight = CollectionUtils.isEmpty(usualScoreWeight) ? new LinkedHashMap<>() : usualScoreWeight;
-                        usualScoreWeight.put(reportEvaluationDto.getName(), reportEvaluationDto.getWeight().add(new BigDecimal(new Random().nextInt(10))));
-                        v.setUsualScoreWeight(usualScoreWeight);
-                    }
+//                    if (Objects.nonNull(reportEvaluationDto.getWeight()) && reportEvaluationDto.getWeight().doubleValue() > 0d) {
+//                        evaluationAvg = evaluationAvg.doubleValue() + reportEvaluationDto.getAvg();
+//                        evaluationScore = evaluationScore.doubleValue() + reportEvaluationDto.getScore();
+//                        evaluationWeight = evaluationWeight.add(reportEvaluationDto.getWeight());
+//                        Map<String, BigDecimal> usualScoreWeight = v.getUsualScoreWeight();
+//                        usualScoreWeight = CollectionUtils.isEmpty(usualScoreWeight) ? new LinkedHashMap<>() : usualScoreWeight;
+//                        usualScoreWeight.put(reportEvaluationDto.getName(), reportEvaluationDto.getWeight().add(new BigDecimal(new Random().nextInt(10))));
+//                        v.setUsualScoreWeight(usualScoreWeight);
+//                    }
                 }
                 if (!CollectionUtils.isEmpty(finalScoreOverviewDtoMap)) {
                     FinalScoreOverviewDto finalScoreOverviewDto = finalScoreOverviewDtoMap.get(k);
@@ -317,12 +317,12 @@ public class TRBasicInfoServiceImpl extends ServiceImpl<TRBasicInfoMapper, TRBas
                     reportEvaluationDtoList.add(reportEvaluationDto1);
 
                     //课程目标-期末成绩达成度计算
-                    if (Objects.nonNull(reportEvaluationDto1.getWeight()) && reportEvaluationDto1.getWeight().doubleValue() > 0d) {
-                        evaluationAvg = evaluationAvg.doubleValue() + reportEvaluationDto1.getAvg();
-                        evaluationScore = evaluationScore.doubleValue() + reportEvaluationDto1.getScore();
-                        evaluationWeight = evaluationWeight.add(reportEvaluationDto1.getWeight());
-                        v.setFinalScoreWeight(reportEvaluationDto1.getWeight().subtract(new BigDecimal(new Random().nextInt(10))));
-                    }
+//                    if (Objects.nonNull(reportEvaluationDto1.getWeight()) && reportEvaluationDto1.getWeight().doubleValue() > 0d) {
+//                        evaluationAvg = evaluationAvg.doubleValue() + reportEvaluationDto1.getAvg();
+//                        evaluationScore = evaluationScore.doubleValue() + reportEvaluationDto1.getScore();
+//                        evaluationWeight = evaluationWeight.add(reportEvaluationDto1.getWeight());
+//                        v.setFinalScoreWeight(reportEvaluationDto1.getWeight().subtract(new BigDecimal(new Random().nextInt(10))));
+//                    }
                 }
                 Double evaluationValue = new BigDecimal(evaluationAvg).add(new BigDecimal(evaluationScore)).divide(evaluationWeight, 2, BigDecimal.ROUND_HALF_UP).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
 

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

@@ -72,30 +72,30 @@ public class TRExamStudentServiceImpl extends ServiceImpl<TRExamStudentMapper, T
                             if (CollectionUtils.isEmpty(reportExamStudentDto.getTargetList())) {
                                 List<ReportExamStudentTargetDto> targetList = new ArrayList<>();
                                 ReportExamStudentUsualScoreDto reportExamStudentUsualScoreDto = null;
-                                ReportExamStudentFinalScoreDto reportExamStudentFinalScoreDto = new ReportExamStudentFinalScoreDto(targetMap.get(courseTargetDto.getTargetId()).getFinalScoreWeight(), dimensionDtoList);
-                                if (!CollectionUtils.isEmpty(reportExamStudentUsualScoreObjDtoMap) && reportExamStudentUsualScoreObjDtoMap.containsKey("作业" + courseTargetDto.getTargetId())) {
-                                    if (Objects.nonNull(targetMap.get(courseTargetDto.getTargetId())) && Objects.nonNull(targetMap.get(courseTargetDto.getTargetId()).getUsualScoreWeight())
-                                            && Objects.nonNull(targetMap.get(courseTargetDto.getTargetId()).getUsualScoreWeight().get("作业" + courseTargetDto.getTargetId()))) {
-                                        ReportExamStudentUsualScoreObjDto reportExamStudentUsualScoreObjDto = reportExamStudentUsualScoreObjDtoMap.get("作业" + courseTargetDto.getTargetId());
-                                        reportExamStudentUsualScoreDto = new ReportExamStudentUsualScoreDto(targetMap.get(courseTargetDto.getTargetId()).getUsualScoreWeight().get("作业" + courseTargetDto.getTargetId()), Arrays.asList(reportExamStudentUsualScoreObjDto));
-                                    }
-                                }
-                                targetList.add(new ReportExamStudentTargetDto(courseTargetDto.getTargetId(), courseTargetDto.getTargetName(), reportExamStudentFinalScoreDto, reportExamStudentUsualScoreDto));
+//                                ReportExamStudentFinalScoreDto reportExamStudentFinalScoreDto = new ReportExamStudentFinalScoreDto(targetMap.get(courseTargetDto.getTargetId()).getFinalScoreWeight(), dimensionDtoList);
+//                                if (!CollectionUtils.isEmpty(reportExamStudentUsualScoreObjDtoMap) && reportExamStudentUsualScoreObjDtoMap.containsKey("作业" + courseTargetDto.getTargetId())) {
+//                                    if (Objects.nonNull(targetMap.get(courseTargetDto.getTargetId())) && Objects.nonNull(targetMap.get(courseTargetDto.getTargetId()).getUsualScoreWeight())
+//                                            && Objects.nonNull(targetMap.get(courseTargetDto.getTargetId()).getUsualScoreWeight().get("作业" + courseTargetDto.getTargetId()))) {
+//                                        ReportExamStudentUsualScoreObjDto reportExamStudentUsualScoreObjDto = reportExamStudentUsualScoreObjDtoMap.get("作业" + courseTargetDto.getTargetId());
+//                                        reportExamStudentUsualScoreDto = new ReportExamStudentUsualScoreDto(targetMap.get(courseTargetDto.getTargetId()).getUsualScoreWeight().get("作业" + courseTargetDto.getTargetId()), Arrays.asList(reportExamStudentUsualScoreObjDto));
+//                                    }
+//                                }
+//                                targetList.add(new ReportExamStudentTargetDto(courseTargetDto.getTargetId(), courseTargetDto.getTargetName(), reportExamStudentFinalScoreDto, reportExamStudentUsualScoreDto));
                                 reportExamStudentDto.setTargetList(targetList);
                             } else {
                                 List<ReportExamStudentTargetDto> targetList = reportExamStudentDto.getTargetList();
                                 Map<Long, ReportExamStudentTargetDto> reportExamStudentTargetDtoMap = targetList.stream().collect(Collectors.toMap(ReportExamStudentTargetDto::getTargetId, Function.identity(), (dto1, dto2) -> dto1));
-                                if (!reportExamStudentTargetDtoMap.containsKey(courseTargetDto.getTargetId())) {
-                                    ReportExamStudentUsualScoreDto reportExamStudentUsualScoreDto = null;
-                                    if (!CollectionUtils.isEmpty(reportExamStudentUsualScoreObjDtoMap) && reportExamStudentUsualScoreObjDtoMap.containsKey("作业" + courseTargetDto.getTargetId())) {
-                                        if (Objects.nonNull(targetMap.get(courseTargetDto.getTargetId())) && Objects.nonNull(targetMap.get(courseTargetDto.getTargetId()).getUsualScoreWeight())
-                                                && Objects.nonNull(targetMap.get(courseTargetDto.getTargetId()).getUsualScoreWeight().get("作业" + courseTargetDto.getTargetId()))) {
-                                            ReportExamStudentUsualScoreObjDto reportExamStudentUsualScoreObjDto = reportExamStudentUsualScoreObjDtoMap.get("作业" + courseTargetDto.getTargetId());
-                                            reportExamStudentUsualScoreDto = new ReportExamStudentUsualScoreDto(targetMap.get(courseTargetDto.getTargetId()).getUsualScoreWeight().get("作业" + courseTargetDto.getTargetId()), Arrays.asList(reportExamStudentUsualScoreObjDto));
-                                        }
-                                    }
-                                    targetList.add(new ReportExamStudentTargetDto(courseTargetDto.getTargetId(), courseTargetDto.getTargetName(), new ReportExamStudentFinalScoreDto(targetMap.get(courseTargetDto.getTargetId()).getFinalScoreWeight(), dimensionDtoList), reportExamStudentUsualScoreDto));
-                                }
+//                                if (!reportExamStudentTargetDtoMap.containsKey(courseTargetDto.getTargetId())) {
+//                                    ReportExamStudentUsualScoreDto reportExamStudentUsualScoreDto = null;
+//                                    if (!CollectionUtils.isEmpty(reportExamStudentUsualScoreObjDtoMap) && reportExamStudentUsualScoreObjDtoMap.containsKey("作业" + courseTargetDto.getTargetId())) {
+//                                        if (Objects.nonNull(targetMap.get(courseTargetDto.getTargetId())) && Objects.nonNull(targetMap.get(courseTargetDto.getTargetId()).getUsualScoreWeight())
+//                                                && Objects.nonNull(targetMap.get(courseTargetDto.getTargetId()).getUsualScoreWeight().get("作业" + courseTargetDto.getTargetId()))) {
+//                                            ReportExamStudentUsualScoreObjDto reportExamStudentUsualScoreObjDto = reportExamStudentUsualScoreObjDtoMap.get("作业" + courseTargetDto.getTargetId());
+//                                            reportExamStudentUsualScoreDto = new ReportExamStudentUsualScoreDto(targetMap.get(courseTargetDto.getTargetId()).getUsualScoreWeight().get("作业" + courseTargetDto.getTargetId()), Arrays.asList(reportExamStudentUsualScoreObjDto));
+//                                        }
+//                                    }
+//                                    targetList.add(new ReportExamStudentTargetDto(courseTargetDto.getTargetId(), courseTargetDto.getTargetName(), new ReportExamStudentFinalScoreDto(targetMap.get(courseTargetDto.getTargetId()).getFinalScoreWeight(), dimensionDtoList), reportExamStudentUsualScoreDto));
+//                                }
                             }
                         }
                     }

distributed-print/src/main/java/com/qmth/distributed/print/api/TRBasicInfoController.java

@@ -184,11 +184,11 @@ public class TRBasicInfoController {
 
         for (int i = 0; i < courseTargetValueDtoList.size(); i++) {
             CourseTargetValueDto courseTargetValueDto = courseTargetValueDtoList.get(i);
-            Map<String, BigDecimal> usualScoreWeightMap = courseTargetValueDto.getUsualScoreWeight();
-            usualScoreWeightMap.forEach((k1, v1) -> {
-                header2_1List.add("");
-                header2_2List.add(k1);
-            });
+//            Map<String, BigDecimal> usualScoreWeightMap = courseTargetValueDto.getUsualScoreWeight();
+//            usualScoreWeightMap.forEach((k1, v1) -> {
+//                header2_1List.add("");
+//                header2_2List.add(k1);
+//            });
 
             CourseTargetTableBean1 courseTargetTableBean1 = new CourseTargetTableBean1(courseTargetValueDto.getTargetName(), courseTargetValueDto.getGraduationRequirement());
             RowRenderData row = Rows.of(courseTargetTableBean1.getName(), courseTargetTableBean1.getTarget()).rowStyle(this.getRowStyle()).create();