add:课程目标列表查询加上知识点

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/result/ObeCourseTargetResult.java

@@ -2,9 +2,11 @@ package com.qmth.distributed.print.business.bean.result;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.qmth.distributed.print.business.bean.dto.CourseDimensionDto;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * @Description: 课程目标查询结果
@@ -39,6 +41,9 @@ public class ObeCourseTargetResult {
     @ApiModelProperty("目标整体权重")
     private BigDecimal totalWeight;
 
+    @ApiModelProperty("课程目标毕业要求")
+    private List<CourseDimensionDto> dimensionList;
+
     public Long getId() {
         return id;
     }
@@ -102,4 +107,12 @@ public class ObeCourseTargetResult {
     public void setTotalWeight(BigDecimal totalWeight) {
         this.totalWeight = totalWeight;
     }
+
+    public List<CourseDimensionDto> getDimensionList() {
+        return dimensionList;
+    }
+
+    public void setDimensionList(List<CourseDimensionDto> dimensionList) {
+        this.dimensionList = dimensionList;
+    }
 }

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

@@ -64,7 +64,14 @@ public class ObeCourseTargetServiceImpl extends ServiceImpl<ObeCourseTargetMappe
         if (Objects.isNull(courseOutline)) {
             throw ExceptionResultEnum.ERROR.exception("课程大纲不存在");
         }
-        return this.baseMapper.findCourseTargetList(obeCourseOutlineId);
+        List<ObeCourseTargetResult> result = this.baseMapper.findCourseTargetList(obeCourseOutlineId);
+        result.forEach(e -> {
+            Long obeCultureProgramRequirementId = e.getObeCultureProgramRequirementId();
+            List<CourseDimensionDto> dimensionList = obeCourseRequirementDimensionService.findByOutlineIdAndRequirementId(
+                    obeCourseOutlineId, obeCultureProgramRequirementId);
+            e.setDimensionList(dimensionList);
+        });
+        return result;
     }
 
     @Transactional
@@ -138,7 +145,7 @@ public class ObeCourseTargetServiceImpl extends ServiceImpl<ObeCourseTargetMappe
             obeCourseTarget.updateInfo(requestUserId);
         } else {
             Double expectValue = findExpectValueByCourseOutlineId(obeCourseOutlineId);
-            if (Objects.nonNull(expectValue)){
+            if (Objects.nonNull(expectValue)) {
                 obeCourseTarget.setExpectValue(expectValue);
             }
             // 新增 (清空权重设置)