Merge remote-tracking branch 'origin/dev_v3.3.1' into dev_v3.3.1

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

@@ -6,9 +6,11 @@ import com.qmth.distributed.print.business.bean.result.CourseDimensionTree;
 import com.qmth.distributed.print.business.bean.result.CourseTargetResult;
 import com.qmth.distributed.print.business.service.CourseDimensionService;
 import com.qmth.distributed.print.business.service.CourseTargetService;
+import com.qmth.distributed.print.business.service.TeachCourseService;
 import com.qmth.teachcloud.common.annotation.OperationLogDetail;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.SysUser;
+import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.enums.log.CustomizedOperationTypeEnum;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
@@ -46,10 +48,24 @@ public class CourseTargetController {
     @Resource
     private CourseDimensionService courseDimensionService;
 
+    @Resource
+    private TeachCourseService teachCourseService;
+
     @ApiOperation(value = "课程目标管理-列表查询")
     @RequestMapping(value = "/list", method = RequestMethod.POST)
     @ApiResponses({ @ApiResponse(code = 200, message = "查询成功", response = CourseTargetResult.class) })
-    public Result findCourseTargetList(@ApiParam(value = "教学课程id") @RequestParam(required = false) String teachCourseId) {
+    public Result findCourseTargetList(@ApiParam(value = "教学课程id") @RequestParam(required = false) String teachCourseId,
+            @ApiParam(value = "考试id") @RequestParam(required = false) String examId,
+            @ApiParam(value = "课程编号") @RequestParam(required = false) String courseCode) {
+        if (SystemConstant.strNotNull(examId) && SystemConstant.strNotNull(courseCode)) {
+            if (SystemConstant.strNotNull(teachCourseId)) {
+                // 要么传examId和courseCode 要么传teachCourseId
+                throw ExceptionResultEnum.ERROR.exception("参数错误");
+            }
+            SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
+            teachCourseId = String.valueOf(teachCourseService.findByExamIdCourseCodeAndUserId(SystemConstant.convertIdToLong(examId),
+                    courseCode, requestUser.getId()).getId());
+        }
         return ResultUtil.ok(courseTargetService.findCourseTargetList(SystemConstant.convertIdToLong(teachCourseId)));
     }