测试报告

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

@@ -0,0 +1,88 @@
+package com.qmth.distributed.print.business.bean.dto.report;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+
+/**
+ * @Description: 期末成绩知识点分数图dto
+ * @Param:
+ * @return:
+ * @Author: wangliang
+ * @Date: 2024/2/26
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class FinalScoreDimensionOverviewDto implements Serializable {
+
+    @JsonSerialize(using = ToStringSerializer.class)
+    @ApiModelProperty(value = "目标id")
+    private Long targetId;
+
+    @JsonSerialize(using = ToStringSerializer.class)
+    @ApiModelProperty(value = "知识点id")
+    private Long dimensionId;
+
+    @ApiModelProperty(value = "最高分")
+    private Double maxScore;
+
+    @ApiModelProperty(value = "最低分")
+    private Double minScore;
+
+    @ApiModelProperty(value = "平均分")
+    private Double avgScore;
+
+    public FinalScoreDimensionOverviewDto() {
+
+    }
+
+    public FinalScoreDimensionOverviewDto(Long targetId, Long dimensionId, Double maxScore, Double minScore, Double avgScore) {
+        this.targetId = targetId;
+        this.dimensionId = dimensionId;
+        this.maxScore = maxScore;
+        this.minScore = minScore;
+        this.avgScore = avgScore;
+    }
+
+    public Long getDimensionId() {
+        return dimensionId;
+    }
+
+    public void setDimensionId(Long dimensionId) {
+        this.dimensionId = dimensionId;
+    }
+
+    public Long getTargetId() {
+        return targetId;
+    }
+
+    public void setTargetId(Long targetId) {
+        this.targetId = targetId;
+    }
+
+    public Double getMaxScore() {
+        return maxScore;
+    }
+
+    public void setMaxScore(Double maxScore) {
+        this.maxScore = maxScore;
+    }
+
+    public Double getMinScore() {
+        return minScore;
+    }
+
+    public void setMinScore(Double minScore) {
+        this.minScore = minScore;
+    }
+
+    public Double getAvgScore() {
+        return avgScore;
+    }
+
+    public void setAvgScore(Double avgScore) {
+        this.avgScore = avgScore;
+    }
+}

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

@@ -0,0 +1,75 @@
+package com.qmth.distributed.print.business.bean.dto.report;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+
+/**
+ * @Description: 期末成绩分数图dto
+ * @Param:
+ * @return:
+ * @Author: wangliang
+ * @Date: 2024/2/26
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class FinalScoreOverviewDto implements Serializable {
+
+    @JsonSerialize(using = ToStringSerializer.class)
+    @ApiModelProperty(value = "目标id")
+    private Long targetId;
+
+    @ApiModelProperty(value = "最高分")
+    private Double maxScore;
+
+    @ApiModelProperty(value = "最低分")
+    private Double minScore;
+
+    @ApiModelProperty(value = "平均分")
+    private Double avgScore;
+
+    public FinalScoreOverviewDto() {
+
+    }
+
+    public FinalScoreOverviewDto(Long targetId, Double maxScore, Double minScore, Double avgScore) {
+        this.targetId = targetId;
+        this.maxScore = maxScore;
+        this.minScore = minScore;
+        this.avgScore = avgScore;
+    }
+
+    public Long getTargetId() {
+        return targetId;
+    }
+
+    public void setTargetId(Long targetId) {
+        this.targetId = targetId;
+    }
+
+    public Double getMaxScore() {
+        return maxScore;
+    }
+
+    public void setMaxScore(Double maxScore) {
+        this.maxScore = maxScore;
+    }
+
+    public Double getMinScore() {
+        return minScore;
+    }
+
+    public void setMinScore(Double minScore) {
+        this.minScore = minScore;
+    }
+
+    public Double getAvgScore() {
+        return avgScore;
+    }
+
+    public void setAvgScore(Double avgScore) {
+        this.avgScore = avgScore;
+    }
+}

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

@@ -154,7 +154,7 @@ public class TRBasicInfoController {
         Map<String, List<Double>> usualScoreMap = new LinkedHashMap<>();//汇总平常成绩分数(用来算最高分，最低分，平均分)
         Map<String, UsualScoreOverviewDto> usualScoreOverviewDtoMap = new LinkedHashMap<>();//整体平常成绩分数图
 //        Map<Long, Map<String, List<Double>>> finalScoreTargetMap = new LinkedHashMap<>();//汇总目标分数(用来算最高分，最低分，平均分)
-        Map<Long, List<Double>> finalScoreTargetMap = new LinkedHashMap<>();//汇总目标分数(用来算最高分，最低分，平均分)
+        Map<Long, List<Double>> finalScoreTargetMap = new LinkedHashMap<>();//汇总目标期末考试分数(用来算最高分，最低分，平均分)
         Map<Long, Map<String, List<Double>>> finalScoreDimensionMap = new LinkedHashMap<>();//汇总知识点分数(用来算最高分，最低分，平均分)
 //        LinkedMultiValueMap<Long, UsualScoreOverviewDto> oList = new LinkedMultiValueMap<>();
         if (!CollectionUtils.isEmpty(finalScoreResultList)) {
@@ -172,9 +172,11 @@ public class TRBasicInfoController {
                         List<CourseTargetDto> courseTargetDtoList = paperStructResult.getTargetList();
                         for (CourseTargetDto courseTargetDto : courseTargetDtoList) {
                             if (!finalScoreTargetMap.containsKey(courseTargetDto.getTargetId())) {
-
+                                finalScoreTargetMap.put(courseTargetDto.getTargetId(), new ArrayList<>(Arrays.asList(Objects.nonNull(jsonObject.get("score")) ? Double.parseDouble(jsonObject.get("score").toString()) : 0d)));
                             } else {
-
+                                List<Double> list = usualScoreMap.get(courseTargetDto.getTargetId());
+                                list.add(Objects.nonNull(jsonObject.get("score")) ? Double.parseDouble(jsonObject.get("score").toString()) : 0d);
+                                finalScoreTargetMap.put(courseTargetDto.getTargetId(), list);
                             }
                             List<DimensionDto> dimensionDtoList = courseTargetDto.getDimensionList();
                         }