测试报告

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/report/CourseTargetWebDto.java

@@ -35,16 +35,16 @@ public class CourseTargetWebDto implements Serializable, Comparable<CourseTarget
     private String graduationRequirementPoint;
 
     @ApiModelProperty(value = "目标整体权重")
-    private BigDecimal targetSumWeight = new BigDecimal(0);
+    private BigDecimal targetSumWeight;
 
     @ApiModelProperty(value = "目标整体分值")
-    private BigDecimal targetSumScore = new BigDecimal(0);
+    private BigDecimal targetSumScore;
 
     @ApiModelProperty(value = "知识点集合")
     private List<DimensionDto> dimensionList;
 
     @ApiModelProperty(value = "目标达成评价值")
-    private BigDecimal evaluationValue = new BigDecimal(0);
+    private BigDecimal evaluationValue;
 
     @ApiModelProperty(value = "评价方式集合")
     private List<ReportEvaluationDto> evaluationList;

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/report/DimensionDto.java

@@ -33,13 +33,13 @@ public class DimensionDto implements Serializable, Comparable<DimensionDto> {
     private String dimensionName;
 
     @ApiModelProperty(value = "知识点分数")
-    private Double dimensionScore = 0.0d;
+    private Double dimensionScore;
 
     @ApiModelProperty(value = "换算分数")
-    private Double dimensionMatrixScore = 0.0d;
+    private Double dimensionMatrixScore;
 
     @ApiModelProperty(value = "换算平均分")
-    private Double dimensionMatrixAvgScore = 0.0d;
+    private Double dimensionMatrixAvgScore;
 
     public DimensionDto() {
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/report/ReportCourseEvaluationResultDto.java

@@ -16,7 +16,7 @@ import java.util.List;
 public class ReportCourseEvaluationResultDto implements Serializable {
 
     @ApiModelProperty(value = "课程目标总达成评价值")
-    private BigDecimal targetEvaluationSumValue = new BigDecimal(0);
+    private BigDecimal targetEvaluationSumValue;
 
     @ApiModelProperty(value = "课程目标集合")
     private List<CourseTargetWebDto> targetList;

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/report/ReportEvaluationDto.java

@@ -35,13 +35,13 @@ public class ReportEvaluationDto implements Serializable, Comparable<ReportEvalu
     private String evaluationDesc;
 
     @ApiModelProperty(value = "权重")
-    private BigDecimal targetWeight = new BigDecimal(0);
+    private BigDecimal targetWeight;
 
     @ApiModelProperty(value = "目标分值")
-    private BigDecimal targetScore = new BigDecimal(0);
+    private BigDecimal targetScore;
 
     @ApiModelProperty(value = "换算平均分")
-    private Double targetAvgScore = 0.0d;
+    private Double targetAvgScore;
 
     public ReportEvaluationDto() {
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/report/ReportExamStudentDto.java

@@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * @Description: 报告课程考核成绩评价明细结果-考生dto
@@ -28,7 +29,7 @@ public class ReportExamStudentDto implements Serializable {
     private String administrativeClass;
 
     @ApiModelProperty(value = "综合成绩")
-    private Double score = 0.0;
+    private Double score;
 
     @ApiModelProperty(value = "课程目标集合")
     private List<ReportExamStudentTargetDto> targetList;
@@ -53,14 +54,6 @@ public class ReportExamStudentDto implements Serializable {
         this.targetList = targetList;
     }
 
-    public ReportExamStudentDto(String name, String studentCode, String administrativeClass, Double score) {
-        this.name = name;
-        this.studentCode = studentCode;
-        this.administrativeClass = administrativeClass;
-        this.score = score;
-    }
-
-
     public ReportExamStudentDto(FinalScoreResult finalScoreResult) {
         this.name = finalScoreResult.getName();
         this.studentCode = finalScoreResult.getStudentCode();
@@ -92,7 +85,7 @@ public class ReportExamStudentDto implements Serializable {
     }
 
     public Double getScore() {
-        return score;
+        return Objects.isNull(score) ? 0.0d : score;
     }
 
     public void setScore(Double score) {

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/report/ReportExamStudentFinalScoreDto.java

@@ -30,19 +30,19 @@ public class ReportExamStudentFinalScoreDto implements Serializable {
     private String evaluationDesc;
 
     @ApiModelProperty(value = "权重")
-    private BigDecimal targetWeight = new BigDecimal(0);
+    private BigDecimal targetWeight;
 
     @ApiModelProperty(value = "目标分值")
-    private BigDecimal targetScore = new BigDecimal(0);
+    private BigDecimal targetScore;
 
     @ApiModelProperty(value = "课程目标转换总分")
-    private Double targetMatrixSumScore = 0.0d;
+    private Double targetMatrixSumScore;
 
     @ApiModelProperty(value = "课程目标集合")
     private List<DimensionDto> dimensionList;
 
     @ApiModelProperty(value = "课程目标考核要素的平均分")
-    private Double matrixAvgScore = 0.0d;
+    private Double matrixAvgScore;
 
     public ReportExamStudentFinalScoreDto() {
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/report/ReportExamStudentTargetDto.java

@@ -30,16 +30,16 @@ public class ReportExamStudentTargetDto implements Serializable, Comparable<Repo
     private String graduationRequirement;
 
     @ApiModelProperty(value = "目标整体权重")
-    private BigDecimal targetSumWeight = new BigDecimal(0);
+    private BigDecimal targetSumWeight;
 
     @ApiModelProperty(value = "目标整体分值")
-    private BigDecimal targetSumScore = new BigDecimal(0);
+    private BigDecimal targetSumScore;
 
     @ApiModelProperty(value = "目标达成评价值")
-    private BigDecimal evaluationValue = new BigDecimal(0);
+    private BigDecimal evaluationValue;
 
     @ApiModelProperty(value = "各课程目标平均分")
-    private Double targetMatrixAvgScore = 0.0;
+    private Double targetMatrixAvgScore;
 
     @ApiModelProperty(value = "期末成绩")
     private ReportExamStudentFinalScoreDto finalScore;

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/report/ReportExamStudentUsualScoreDto.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -17,6 +18,9 @@ import java.util.Map;
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class ReportExamStudentUsualScoreDto implements Serializable {
 
+    @ApiModelProperty(value = "权重")
+    private BigDecimal targetWeight;
+
     @ApiModelProperty(value = "平时成绩对象集合")
     private Map<Long, List<ReportExamStudentUsualScoreObjDto>> scoreMap;
 
@@ -27,17 +31,27 @@ public class ReportExamStudentUsualScoreDto implements Serializable {
 
     }
 
+    public ReportExamStudentUsualScoreDto(BigDecimal targetSumWeight, List<ReportExamStudentUsualScoreObjDto> scoreList) {
+        this.targetWeight = targetSumWeight;
+        this.scoreList = scoreList;
+    }
+
     public ReportExamStudentUsualScoreDto(ReportExamStudentUsualScoreDto reportExamStudentUsualScoreDto) {
+        this.targetWeight = reportExamStudentUsualScoreDto.getTargetWeight();
         this.scoreMap = reportExamStudentUsualScoreDto.getScoreMap();
         this.scoreList = reportExamStudentUsualScoreDto.getScoreList();
     }
 
-    public ReportExamStudentUsualScoreDto(Map<Long, List<ReportExamStudentUsualScoreObjDto>> scoreMap) {
-        this.scoreMap = scoreMap;
+    public BigDecimal getTargetWeight() {
+        return targetWeight;
     }
 
-    public ReportExamStudentUsualScoreDto(List<ReportExamStudentUsualScoreObjDto> scoreList) {
-        this.scoreList = scoreList;
+    public void setTargetWeight(BigDecimal targetWeight) {
+        this.targetWeight = targetWeight;
+    }
+
+    public ReportExamStudentUsualScoreDto(Map<Long, List<ReportExamStudentUsualScoreObjDto>> scoreMap) {
+        this.scoreMap = scoreMap;
     }
 
     public Map<Long, List<ReportExamStudentUsualScoreObjDto>> getScoreMap() {

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/report/ReportExamStudentUsualScoreObjDto.java

@@ -34,25 +34,25 @@ public class ReportExamStudentUsualScoreObjDto implements Serializable, Comparab
     private String evaluationDesc;
 
     @ApiModelProperty(value = "作业权重")
-    private BigDecimal targetWeight = new BigDecimal(0);
+    private BigDecimal targetWeight;
 
     @ApiModelProperty(value = "作业目标分值")
-    private BigDecimal targetScore = new BigDecimal(0);
+    private BigDecimal targetScore;
 
     @ApiModelProperty(value = "作业整体权重")
-    private BigDecimal targetSumWeight = new BigDecimal(0);
+    private BigDecimal targetSumWeight;
 
     @ApiModelProperty(value = "作业整体分值")
-    private BigDecimal targetSumScore = new BigDecimal(0);
+    private BigDecimal targetSumScore;
 
     @ApiModelProperty(value = "原始分数")
-    private Double score = 0.0d;
+    private Double score;
 
     @ApiModelProperty(value = "换算分数")
-    private Double matrixScore = 0.0d;
+    private Double matrixScore;
 
     @ApiModelProperty(value = "课程目标考核要素的平均分")
-    private Double matrixAvgScore = 0.0d;
+    private Double matrixAvgScore;
 
     public ReportExamStudentUsualScoreObjDto() {
 

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

@@ -60,7 +60,7 @@ public class TRExamStudentServiceImpl extends ServiceImpl<TRExamStudentMapper, T
                         List<ReportExamStudentUsualScoreObjDto> scoreObjDtoList = reportExamStudentUsualScoreSumDto.getScoreMap().get(k);
                         CourseTargetWordDto courseTargetWordDto = targetWordMap.get(k);
                         ReportExamStudentFinalScoreDto reportExamStudentFinalScoreDto = new ReportExamStudentFinalScoreDto(courseTargetWordDto.getFinalScoreDto(), dimensionDtoList);
-                        ReportExamStudentUsualScoreDto reportExamStudentUsualScoreDto = new ReportExamStudentUsualScoreDto(scoreObjDtoList);
+                        ReportExamStudentUsualScoreDto reportExamStudentUsualScoreDto = new ReportExamStudentUsualScoreDto(courseTargetWordDto.getUsualScoreDto().getUsualScoreTargetSumWeight(), scoreObjDtoList);
 
                         BigDecimal dimensionMatrixSumScore = new BigDecimal(0);
                         if (!reportExamStudentTargetDtoMap.containsKey(k)) {
@@ -76,7 +76,7 @@ public class TRExamStudentServiceImpl extends ServiceImpl<TRExamStudentMapper, T
                             reportExamStudentDto.setScore(reportExamStudentDto.getScore() + usualMatrixSumScore);
                             reportExamStudentFinalScoreDto.setTargetMatrixSumScore(dimensionMatrixSumScore.doubleValue());
                             ReportExamStudentFinalScoreDto reportExamStudentFinalScoreTempDto = new ReportExamStudentFinalScoreDto(courseTargetWordDto.getFinalScoreDto(), dimensionDtoList.stream().map(DimensionDto::new).collect(Collectors.toList()), dimensionMatrixSumScore.doubleValue());
-                            ReportExamStudentTargetDto reportExamStudentTargetDto = new ReportExamStudentTargetDto(courseTargetWordDto, reportExamStudentFinalScoreTempDto, new ReportExamStudentUsualScoreDto(scoreObjDtoList.stream().map(ReportExamStudentUsualScoreObjDto::new).collect(Collectors.toList())));
+                            ReportExamStudentTargetDto reportExamStudentTargetDto = new ReportExamStudentTargetDto(courseTargetWordDto, reportExamStudentFinalScoreTempDto, new ReportExamStudentUsualScoreDto(courseTargetWordDto.getUsualScoreDto().getUsualScoreTargetSumWeight(), scoreObjDtoList.stream().map(ReportExamStudentUsualScoreObjDto::new).collect(Collectors.toList())));
                             reportExamStudentTargetDtoMap.put(k, reportExamStudentTargetDto);
                         } else {
                             ReportExamStudentTargetDto reportExamStudentTargetDto = reportExamStudentTargetDtoMap.get(k);