题卡相关bug

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

@@ -48,9 +48,9 @@ public interface ExamCardService extends IService<ExamCard> {
     /**
      * 题卡复制
      *
-     * @param id       被复制的题卡id
-     * @param courseId 复制后的题卡所绑定的课程id
+     * @param id         被复制的题卡id
+     * @param courseCode 复制后的题卡所绑定的课程编号
      * @return 复制后的题卡id
      */
-    Long copyCard(Long id, Long courseId);
+    Long copyCard(Long id, String courseCode);
 }

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

@@ -217,11 +217,11 @@ public interface ExamTaskService extends IService<ExamTask> {
      * </P>
      *
      * @param examObjectType 考试对象类型
-     * @param basicCourseId  基础课程id
+     * @param courseCode     基础课程编号
      * @param requestUser    请求的用户
      * @return 命题任务考试对象查询结果
      */
-    List<ExamTaskStudentObjectResult> findExamTaskStudentObject(ExamObjectType examObjectType, Long basicCourseId, SysUser requestUser) throws Exception;
+    List<ExamTaskStudentObjectResult> findExamTaskStudentObject(ExamObjectType examObjectType, String courseCode, SysUser requestUser) throws Exception;
 
     /**
      * 命题任务考生导入

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

@@ -458,13 +458,13 @@ public class ExamCardServiceImpl extends ServiceImpl<ExamCardMapper, ExamCard> i
 
     @Transactional
     @Override
-    public Long copyCard(Long id, Long courseId) {
+    public Long copyCard(Long id, String courseCode) {
         SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
-        BasicCourse basicCourse = basicCourseService.getById(courseId);
-        if (Objects.isNull(basicCourse)) {
-            throw ExceptionResultEnum.ERROR.exception("未找复制后题卡要绑定的课程");
+        List<BasicCourse> basicCourseList = basicCourseService.list(new QueryWrapper<BasicCourse>().lambda().eq(BasicCourse::getSchoolId, requestUser.getSchoolId()).eq(BasicCourse::getCode, courseCode));
+        if (basicCourseList.size() != 1) {
+            throw ExceptionResultEnum.ERROR.exception("复制后题卡要绑定的课程异常");
         }
-        String courseCode = basicCourse.getCode();
+        BasicCourse basicCourse = basicCourseList.get(0);
 
         ExamCard examCard = this.getById(id);
         if (examCard == null) {

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

@@ -1871,15 +1871,20 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public List<ExamTaskStudentObjectResult> findExamTaskStudentObject(ExamObjectType examObjectType, Long basicCourseId, SysUser requestUser) throws Exception {
+    public List<ExamTaskStudentObjectResult> findExamTaskStudentObject(ExamObjectType examObjectType, String courseCode, SysUser requestUser) throws Exception {
         Long schoolId = requestUser.getSchoolId();
         Long userId = requestUser.getId();
         List<ExamTaskStudentObjectResult> result = new ArrayList<>();
         switch (examObjectType) {
             case TEACH_CLAZZ_STUDENT:
-                if (!SystemConstant.longNotNull(basicCourseId)) {
-                    throw ExceptionResultEnum.ERROR.exception("缺少考试课程id");
+                if (!SystemConstant.strNotNull(courseCode)) {
+                    throw ExceptionResultEnum.ERROR.exception("缺少考试课程编号");
                 }
+                BasicCourse basicCourse = basicCourseService.getOne(new QueryWrapper<BasicCourse>().lambda().eq(BasicCourse::getSchoolId,schoolId).eq(BasicCourse::getCode,courseCode));
+                if (Objects.isNull(basicCourse)){
+                    throw ExceptionResultEnum.ERROR.exception("找不到课程编号对应的课程");
+                }
+                Long basicCourseId = basicCourse.getId();
                 TeachCourse teachCourse = teachCourseService.getOne(new QueryWrapper<TeachCourse>().lambda().eq(TeachCourse::getSchoolId, schoolId).eq(TeachCourse::getBasicCourseId, basicCourseId));
                 if (Objects.nonNull(teachCourse)) {
                     // 教学班对象

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

@@ -204,8 +204,8 @@ public class ExamCardController {
     @ApiOperation(value = "复制题卡")
     @RequestMapping(value = "/copy", method = RequestMethod.POST)
     public Result copyCard(@RequestParam(value = "id") String id,
-                           @RequestParam(value = "courseId") String courseId) {
-        Long copyCardId = examCardService.copyCard(SystemConstant.convertIdToLong(id),SystemConstant.convertIdToLong(courseId));
+                           @RequestParam(value = "courseCode") String courseCode) {
+        Long copyCardId = examCardService.copyCard(SystemConstant.convertIdToLong(id),courseCode);
         return ResultUtil.ok(String.valueOf(copyCardId), "");
     }
 }

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

@@ -854,9 +854,9 @@ public class ExamTaskController {
     @Transactional(rollbackFor = Exception.class)
     @ApiResponses({@ApiResponse(code = 200, message = "{\"success\":true}", response = Result.class)})
     public Result findExamTaskStudentObject(@RequestParam ExamObjectType examObjectType,
-                                            @RequestParam(required = false) String basicCourseId) throws Exception {
+                                            @RequestParam(required = false) String courseCode) throws Exception {
         SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
-        return ResultUtil.ok(examTaskService.findExamTaskStudentObject(examObjectType, SystemConstant.convertIdToLong(basicCourseId), requestUser));
+        return ResultUtil.ok(examTaskService.findExamTaskStudentObject(examObjectType, courseCode, requestUser));
     }
 
     @ApiOperation(value = "入库申请-导入考生对象")