课程目标达成度修改

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/obe/MatrixSubRequirementDto.java

@@ -12,6 +12,17 @@ public class MatrixSubRequirementDto extends BasicProfessional {
     private Double scale;
     private String content;
 
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long subRequirementId;
+
+    public Long getSubRequirementId() {
+        return subRequirementId;
+    }
+
+    public void setSubRequirementId(Long subRequirementId) {
+        this.subRequirementId = subRequirementId;
+    }
+
     @Override
     public Long getId() {
         return id;

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

@@ -104,10 +104,11 @@ public class ObeCourseRequirementMatrixServiceImpl extends ServiceImpl<ObeCourse
                     }
                     List<MatrixSubRequirementDto> matrixSubRequirementDtoList = requirementList.stream().map(tpMatrix -> {
                         MatrixSubRequirementDto matrixSubRequirementDto = new MatrixSubRequirementDto();
-                        matrixSubRequirementDto.setId(tpMatrix.getObeSubRequirementId());
+                        matrixSubRequirementDto.setId(tpMatrix.getId());
                         matrixSubRequirementDto.setName(tpMatrix.getRequirementSortNum() + "-" + tpMatrix.getSubRequirementSortNum());
                         matrixSubRequirementDto.setScale(tpMatrix.getScale());
                         matrixSubRequirementDto.setContent(tpMatrix.getRequirementContent());
+                        matrixSubRequirementDto.setSubRequirementId(tpMatrix.getObeSubRequirementId());
                         return matrixSubRequirementDto;
                     }).collect(Collectors.toList());
                     matrixRequirementDto.setSubRequirements(matrixSubRequirementDtoList);