专业达成度新增描述

teachcloud-obe/src/main/java/com/qmth/teachcloud/obe/been/report/ObeCourseRequirementDto.java

@@ -28,12 +28,15 @@ public class ObeCourseRequirementDto implements Serializable {
     @ApiModelProperty(value = "学期")
     private String semesterName;
 
-    @ApiModelProperty(value = "课程毕业指标达成值")
+    @ApiModelProperty(value = "专业毕业指标达成值")
     private BigDecimal matrixDegree;
 
     @ApiModelProperty(value = "课程毕业指标集合")
     private List<ObeRequirementDto> obeRequirements;
 
+    @ApiModelProperty(value = "课程指标达成值")
+    private BigDecimal courseMatrixDegree;
+
     public ObeCourseRequirementDto() {
 
     }
@@ -50,6 +53,7 @@ public class ObeCourseRequirementDto implements Serializable {
         this.semesterName = obeCourseRequirementDto.getSemesterName();
         this.matrixDegree = obeCourseRequirementDto.getMatrixDegree();
         this.obeRequirements = obeCourseRequirementDto.getObeRequirements().stream().map(ObeRequirementDto::new).collect(Collectors.toList());
+        this.courseMatrixDegree = obeCourseRequirementDto.getCourseMatrixDegree();
     }
 
     public void updateInfo() {
@@ -96,4 +100,12 @@ public class ObeCourseRequirementDto implements Serializable {
     public void setObeRequirements(List<ObeRequirementDto> obeRequirements) {
         this.obeRequirements = obeRequirements;
     }
+
+    public BigDecimal getCourseMatrixDegree() {
+        return courseMatrixDegree;
+    }
+
+    public void setCourseMatrixDegree(BigDecimal courseMatrixDegree) {
+        this.courseMatrixDegree = courseMatrixDegree;
+    }
 }

teachcloud-obe/src/main/java/com/qmth/teachcloud/obe/service/impl/ObeCourseRequirementReportServiceImpl.java

@@ -228,6 +228,7 @@ public class ObeCourseRequirementReportServiceImpl extends ServiceImpl<ObeCourse
                             for (Map.Entry<Long, List<ObeSubRequirementsDto>> entry : matrixSubRequirementIdMap.entrySet()) {
                                 OptionalDouble evaluationValue = entry.getValue().stream().mapToDouble(x -> Objects.nonNull(x.getEvaluationValue()) ? x.getEvaluationValue().doubleValue() : 0.0d).average();
                                 if (evaluationValue.isPresent()) {
+                                    obeCourseRequirementDto.setCourseMatrixDegree(new BigDecimal(evaluationValue.getAsDouble()));
                                     ObeSubRequirementsDto obeSubRequirementsDto = entry.getValue().get(0);
                                     BigDecimal bigDecimal = new BigDecimal(evaluationValue.getAsDouble()).multiply(obeSubRequirementsDto.getScale()).setScale(2, BigDecimal.ROUND_HALF_UP);
                                     entry.getValue().stream().peek(x -> x.setMatrixDegree(bigDecimal)).collect(Collectors.toList());