测试报告

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/result/report/word/CourseBasicBean.java

@@ -3,6 +3,7 @@ package com.qmth.distributed.print.business.bean.result.report.word;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 
 /**
  * @Description: 课程基本信息bean
@@ -46,6 +47,12 @@ public class CourseBasicBean implements Serializable {
     @ApiModelProperty(name = "课程目标数")
     Integer courseTargetNum;
 
+    @ApiModelProperty(name = "平时作业权重")
+    BigDecimal usualScoreWeight;
+
+    @ApiModelProperty(name = "期末考试权重")
+    BigDecimal finalScoreWeight;
+
     public CourseBasicBean() {
 
     }
@@ -65,6 +72,22 @@ public class CourseBasicBean implements Serializable {
         this.courseTargetNum = courseTargetNum;
     }
 
+    public BigDecimal getUsualScoreWeight() {
+        return usualScoreWeight;
+    }
+
+    public void setUsualScoreWeight(BigDecimal usualScoreWeight) {
+        this.usualScoreWeight = usualScoreWeight;
+    }
+
+    public BigDecimal getFinalScoreWeight() {
+        return finalScoreWeight;
+    }
+
+    public void setFinalScoreWeight(BigDecimal finalScoreWeight) {
+        this.finalScoreWeight = finalScoreWeight;
+    }
+
     public String getCourseTarget() {
         return courseTarget;
     }

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

@@ -707,6 +707,7 @@ public class TRBasicInfoServiceImpl extends ServiceImpl<TRBasicInfoMapper, TRBas
                             ReportExamStudentUsualScoreDto reportExamStudentUsualScoreDto = reportExamStudentTargetDto.getUsualScore();
                             //平常作业
                             if (Objects.nonNull(reportExamStudentUsualScoreDto) && !CollectionUtils.isEmpty(reportExamStudentUsualScoreDto.getScoreList())) {
+                                courseReportBean.getCourseBasicBean().setUsualScoreWeight(reportExamStudentUsualScoreDto.getTargetWeight());
                                 List<ReportExamStudentUsualScoreObjDto> reportExamStudentUsualScoreObjDtoList = reportExamStudentUsualScoreDto.getScoreList();
                                 for (ReportExamStudentUsualScoreObjDto reportExamStudentUsualScoreObjDto : reportExamStudentUsualScoreObjDtoList) {
                                     switch (trExamStudent.getName()) {
@@ -730,6 +731,7 @@ public class TRBasicInfoServiceImpl extends ServiceImpl<TRBasicInfoMapper, TRBas
                             //期末考试
                             ReportExamStudentFinalScoreDto reportExamStudentFinalScoreDto = reportExamStudentTargetDto.getFinalScore();
                             if (Objects.nonNull(reportExamStudentFinalScoreDto) && !CollectionUtils.isEmpty(reportExamStudentFinalScoreDto.getDimensionList())) {
+                                courseReportBean.getCourseBasicBean().setFinalScoreWeight(reportExamStudentFinalScoreDto.getTargetWeight());
                                 switch (trExamStudent.getName()) {
                                     case "目标分":
                                         examStudent_cells.add(Cells.of(df.format(reportExamStudentFinalScoreDto.getTargetScore())).create());

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

@@ -122,7 +122,7 @@ public class TRExamStudentServiceImpl extends ServiceImpl<TRExamStudentMapper, T
             ReportExamStudentDto reportExamStudentTargetAvgDto = new ReportExamStudentDto("各课程目标平均分", "各课程目标平均分", null, null, targetDtoList);
 
             //目标分处理
-            this.targetScoreHandle(reportExamStudentTargetDto);
+//            this.targetScoreHandle(reportExamStudentTargetDto);
             //各课程目标平均分处理
 //            this.targetAvgScoreHandle(reportExamStudentTargetAvgDto);
 
@@ -170,47 +170,47 @@ public class TRExamStudentServiceImpl extends ServiceImpl<TRExamStudentMapper, T
         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);
-    }
+//    /**
+//     * 目标分处理
+//     *
+//     * @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);
+//    }
 }