fix bug

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

@@ -39,6 +39,9 @@ public class ObeSubRequirementsDto extends CourseTargetWebDto {
     @ApiModelProperty(value = "毕业指标点达成值")
     private BigDecimal matrixDegree;
 
+    @ApiModelProperty(value = "课程指标达成值")
+    private BigDecimal courseMatrixDegree;
+
     public ObeSubRequirementsDto() {
 
     }
@@ -61,6 +64,7 @@ public class ObeSubRequirementsDto extends CourseTargetWebDto {
         setDimensionScoreSum(obeSubRequirementsDto.getDimensionScoreSum());
         setDimensionPoint(obeSubRequirementsDto.getDimensionPoint());
         setFinalScoreQuestionScoreSum(obeSubRequirementsDto.getFinalScoreQuestionScoreSum());
+        this.courseMatrixDegree = obeSubRequirementsDto.getCourseMatrixDegree();
     }
 
     public ObeSubRequirementsDto(CourseTargetWebDto courseTargetWebDto, MatrixSubRequirementDto matrixSubRequirementDto) {
@@ -92,6 +96,14 @@ public class ObeSubRequirementsDto extends CourseTargetWebDto {
         this.subRequirementId = matrixSubRequirementDto.getSubRequirementId();
     }
 
+    public BigDecimal getCourseMatrixDegree() {
+        return courseMatrixDegree;
+    }
+
+    public void setCourseMatrixDegree(BigDecimal courseMatrixDegree) {
+        this.courseMatrixDegree = courseMatrixDegree;
+    }
+
     public Long getSubRequirementId() {
         return subRequirementId;
     }

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

@@ -234,6 +234,7 @@ public class ObeCourseRequirementReportServiceImpl extends ServiceImpl<ObeCourse
                                 OptionalDouble evaluationValue = entry.getValue().stream().mapToDouble(x -> Objects.nonNull(x.getEvaluationValue()) ? x.getEvaluationValue().doubleValue() : 0.0d).average();
                                 if (evaluationValue.isPresent()) {
                                     ObeSubRequirementsDto obeSubRequirementsDto = entry.getValue().get(0);
+                                    obeSubRequirementsDto.setCourseMatrixDegree(new BigDecimal(evaluationValue.getAsDouble()).setScale(2, BigDecimal.ROUND_HALF_UP));
                                     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());
                                 }
@@ -247,6 +248,7 @@ public class ObeCourseRequirementReportServiceImpl extends ServiceImpl<ObeCourse
                                 for (ObeSubRequirementsDto obeSubRequirementsDto : obeSubRequirementsDtoList) {
                                     if (matrixSubRequirementIdMap.containsKey(obeSubRequirementsDto.getSubRequirementId())) {
                                         obeSubRequirementsDto.setMatrixDegree(matrixSubRequirementIdMap.get(obeSubRequirementsDto.getSubRequirementId()).get(0).getMatrixDegree());
+                                        obeSubRequirementsDto.setCourseMatrixDegree(matrixSubRequirementIdMap.get(obeSubRequirementsDto.getSubRequirementId()).get(0).getCourseMatrixDegree());
                                     }
                                     if (obeSubRequirementsDtoMap.containsKey(obeSubRequirementsDto.getSubRequirementId())) {
                                         List<ObeSubRequirementsDto> obeSubRequirementsDtoListTemp = obeSubRequirementsDtoMap.get(obeSubRequirementsDto.getSubRequirementId());