add:代码修改

distributed-print-business/src/main/resources/db/log/caozixuan.sql

@@ -118,4 +118,7 @@ INSERT INTO sys_privilege (id, name, url, type, parent_id, sequence, property, e
 INSERT INTO sys_privilege (id, name, url, type, parent_id, sequence, property, enable, default_auth, front_display) VALUES ('3052', '评价方式管理-删除', '/api/admin/obe/course_evaluation/delete', 'URL', '3044', '3', 'AUTH', '1', '1', '1');
 INSERT INTO sys_privilege (id, name, url, type, parent_id, sequence, property, enable, default_auth, front_display) VALUES ('3053', '课程权重管理-列表查询', '/api/admin/obe/course_weight/find', 'URL', '3044', '4', 'AUTH', '1', '1', '1');
 INSERT INTO sys_privilege (id, name, url, type, parent_id, sequence, property, enable, default_auth, front_display) VALUES ('3054', '课程权重管理-新增/编辑', '/api/admin/obe/course_weight/save', 'URL', '3044', '5', 'AUTH', '1', '1', '1');
-UPDATE sys_privilege SET related = '3050,3051,3052,3053,3054' WHERE (id = '3044');
+UPDATE sys_privilege SET related = '3050,3051,3052,3053,3054' WHERE (id = '3044');
+
+INSERT INTO sys_privilege (id, name, url, type, parent_id, sequence, property, enable, default_auth, front_display) VALUES ('3025', '根据培养方案、课程查询指标点', '/api/admin/obe/course_target/sub_requirement/list', 'URL', '3016', '9', 'AUTH', '1', '1', '1');
+UPDATE sys_privilege SET related = '3005,3017,3018,3019,3020,3021,3022,3023,3024,3025' WHERE (id = '3016');

distributed-print-business/src/main/resources/mapper/ObeCultureProgramRequirementMapper.xml

@@ -23,9 +23,11 @@
             obe_course_requirement_matrix ocrm
                 LEFT JOIN
             obe_culture_program_requirement ocpr ON ocrm.obe_sub_requirement_id = ocpr.id
+                LEFT JOIN
+            obe_culture_program_course ocpc ON ocrm.obe_course_id = ocpc.id
         WHERE
             ocrm.culture_program_id = #{cultureProgramId}
-          AND ocrm.obe_course_id = #{courseId}
+          AND ocpc.course_id = #{courseId}
     </select>
 
 </mapper>

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

@@ -5,10 +5,7 @@ import com.qmth.distributed.print.business.bean.params.ObeCourseOutlineParam;
 import com.qmth.distributed.print.business.bean.result.EditResult;
 import com.qmth.distributed.print.business.bean.result.ObeCourseBasicInfoResult;
 import com.qmth.distributed.print.business.bean.result.ObeCourseOutlineResult;
-import com.qmth.distributed.print.business.entity.ObeCultureProgramRequirement;
 import com.qmth.distributed.print.business.service.ObeCourseOutlineService;
-import com.qmth.distributed.print.business.service.ObeCultureProgramCourseService;
-import com.qmth.distributed.print.business.service.ObeCultureProgramRequirementService;
 import com.qmth.teachcloud.common.annotation.OperationLogDetail;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.enums.log.OperationTypeEnum;
@@ -38,8 +35,6 @@ public class ObeCourseOutlineController {
 
     @Resource
     private ObeCourseOutlineService obeCourseOutlineService;
-    @Resource
-    private ObeCultureProgramRequirementService obeCultureProgramRequirementService;
 
     @ApiOperation(value = "课程大纲-查询")
     @RequestMapping(value = "/page", method = RequestMethod.POST)
@@ -103,12 +98,4 @@ public class ObeCourseOutlineController {
     public Result findCourseWeightSettingStatus(@ApiParam(value = "课程大纲id", required = true) @RequestParam String obeCourseOutlineId) {
         return ResultUtil.ok(obeCourseOutlineService.findCourseWeightSettingStatus(SystemConstant.convertIdToLong(obeCourseOutlineId)));
     }
-
-    @ApiOperation(value = "根据培养方案、课程查询指标点")
-    @RequestMapping(value = "/sub_requirement/list", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "分页查询", response = Result.class)})
-    public Result listCourse(@ApiParam(value = "培养方案ID", required = true) @RequestParam Long cultureProgramId,
-                             @ApiParam(value = "课程ID", required = true) @RequestParam Long courseId) {
-        return ResultUtil.ok(obeCultureProgramRequirementService.listSubRequirement(cultureProgramId, courseId));
-    }
 }

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

@@ -9,6 +9,7 @@ import com.qmth.distributed.print.business.bean.result.ObeCourseTargetResult;
 import com.qmth.distributed.print.business.service.ObeCourseDimensionService;
 import com.qmth.distributed.print.business.service.ObeCourseRequirementDimensionService;
 import com.qmth.distributed.print.business.service.ObeCourseTargetService;
+import com.qmth.distributed.print.business.service.ObeCultureProgramRequirementService;
 import com.qmth.teachcloud.common.annotation.OperationLogDetail;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.SysUser;
@@ -50,6 +51,9 @@ public class ObeCourseTargetController {
     @Resource
     private ObeCourseRequirementDimensionService obeCourseRequirementDimensionService;
 
+    @Resource
+    private ObeCultureProgramRequirementService obeCultureProgramRequirementService;
+
     @ApiOperation(value = "课程目标管理-列表查询")
     @RequestMapping(value = "/list", method = RequestMethod.POST)
     @ApiResponses({ @ApiResponse(code = 200, message = "查询成功", response = ObeCourseTargetResult.class) })
@@ -133,4 +137,13 @@ public class ObeCourseTargetController {
         obeCourseTargetService.settingExpectValue(obeCourseTargetExpectValueParam, sysUser);
         return ResultUtil.ok();
     }
+
+    @ApiOperation(value = "根据培养方案、课程查询指标点")
+    @RequestMapping(value = "/sub_requirement/list", method = RequestMethod.POST)
+    @ApiResponses({ @ApiResponse(code = 200, message = "分页查询", response = Result.class) })
+    public Result listCourse(@ApiParam(value = "培养方案ID", required = true) @RequestParam String cultureProgramId,
+            @ApiParam(value = "课程ID", required = true) @RequestParam String courseId) {
+        return ResultUtil.ok(obeCultureProgramRequirementService.listSubRequirement(SystemConstant.convertIdToLong(cultureProgramId),
+                SystemConstant.convertIdToLong(courseId)));
+    }
 }