入库申请-新建命题任务

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

@@ -19,10 +19,10 @@ import com.qmth.distributed.print.business.enums.PrintPlanStatusEnum;
 import com.qmth.distributed.print.business.mapper.ExamTaskPrintMapper;
 import com.qmth.distributed.print.business.service.*;
 import com.qmth.teachcloud.common.contant.SystemConstant;
-import com.qmth.teachcloud.common.entity.BasicCourse;
+import com.qmth.teachcloud.common.entity.BasicUserCourse;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
-import com.qmth.teachcloud.common.service.BasicCourseService;
+import com.qmth.teachcloud.common.service.BasicUserCourseService;
 import com.qmth.teachcloud.common.util.ConvertUtil;
 import com.qmth.teachcloud.common.util.ServletUtil;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -60,7 +60,7 @@ public class ExamTaskPrintServiceImpl extends ServiceImpl<ExamTaskPrintMapper, E
     private BasicExamRuleService basicExamRuleService;
 
     @Autowired
-    private BasicCourseService basicCourseService;
+    private BasicUserCourseService basicUserCourseService;
 
     @Resource
     ConvertUtil convertUtil;
@@ -257,19 +257,17 @@ public class ExamTaskPrintServiceImpl extends ServiceImpl<ExamTaskPrintMapper, E
     @Override
     public List<TaskPrintClassDto> listClass(String printPlanId, String courseCode, String paperNumber) {
         Long schoolId = (Long) ServletUtil.getRequestHeaderSchoolId();
-        QueryWrapper<BasicCourse> courseQueryWrapper = new QueryWrapper<>();
-        courseQueryWrapper.lambda().eq(BasicCourse::getSchoolId, schoolId).eq(BasicCourse::getCode, courseCode);
-        List<BasicCourse> courseList = basicCourseService.list(courseQueryWrapper);
+        List<BasicUserCourse> courseList = basicUserCourseService.listBySchoolIdAndCourseCode(schoolId, courseCode);
         List<String> stringList = courseList.stream().map(m -> m.getClazz()).distinct().collect(Collectors.toList());
 
-        if(!CollectionUtils.isEmpty(stringList)) {
+        if (!CollectionUtils.isEmpty(stringList)) {
             QueryWrapper<ExamTaskPrint> examTaskPrintQueryWrapper = new QueryWrapper<>();
             examTaskPrintQueryWrapper.lambda().eq(ExamTaskPrint::getPrintPlanId, printPlanId).eq(ExamTaskPrint::getCourseCode, courseCode).eq(ExamTaskPrint::getPaperNumber, paperNumber);
             List<ExamTaskPrint> examTaskPrints = this.list(examTaskPrintQueryWrapper);
             for (ExamTaskPrint examTaskPrint : examTaskPrints) {
                 List<String> classIds = Arrays.asList(examTaskPrint.getClassId().split(","));
                 for (String classId : classIds) {
-                    if(stringList.contains(classId)){
+                    if (stringList.contains(classId)) {
                         stringList.remove(classId);
                     }
                 }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/entity/BasicCourse.java

@@ -46,8 +46,6 @@ public class BasicCourse extends BaseEntity implements Serializable {
      */
     private String name;
 
-    private String clazz;
-
     @ApiModelProperty(value = "是否可用")
     @TableField("enable")
     private Boolean enable;
@@ -103,12 +101,4 @@ public class BasicCourse extends BaseEntity implements Serializable {
     public void setTeachingRoomId(Long teachingRoomId) {
         this.teachingRoomId = teachingRoomId;
     }
-
-    public String getClazz() {
-        return clazz;
-    }
-
-    public void setClazz(String clazz) {
-        this.clazz = clazz;
-    }
 }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/mapper/BasicUserCourseMapper.java

@@ -2,6 +2,9 @@ package com.qmth.teachcloud.common.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.qmth.teachcloud.common.entity.BasicUserCourse;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +16,5 @@ import com.qmth.teachcloud.common.entity.BasicUserCourse;
  */
 public interface BasicUserCourseMapper extends BaseMapper<BasicUserCourse> {
 
+    List<BasicUserCourse> listBySchoolIdAndCourseCode(@Param("schoolId") Long schoolId, @Param("courseCode") String courseCode);
 }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/BasicUserCourseService.java

@@ -28,4 +28,6 @@ public interface BasicUserCourseService extends IService<BasicUserCourse> {
      * @param sysUser 执行人
      */
     void updateByCourseIdAndClazzList(Long courseId, List<String> clazzList,SysUser sysUser);
+
+    List<BasicUserCourse> listBySchoolIdAndCourseCode(Long schoolId, String courseCode);
 }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/BasicUserCourseServiceImpl.java

@@ -99,4 +99,9 @@ public class BasicUserCourseServiceImpl extends ServiceImpl<BasicUserCourseMappe
         }
         this.saveBatch(willAddList);
     }
+
+    @Override
+    public List<BasicUserCourse> listBySchoolIdAndCourseCode(Long schoolId, String courseCode) {
+        return this.baseMapper.listBySchoolIdAndCourseCode(schoolId, courseCode);
+    }
 }

teachcloud-common/src/main/resources/mapper/BasicUserCourseMapper.xml

@@ -14,5 +14,22 @@
         id,
         user_id, course_id
     </sql>
+    <select id="listBySchoolIdAndCourseCode" resultType="com.qmth.teachcloud.common.entity.BasicUserCourse">
+        SELECT
+            a.id,
+            a.school_id schoolId,
+            a.org_id orgId,
+            a.user_id userId,
+            a.course_id courseId,
+            a.clazz,
+            a.create_id createId,
+            a.create_time createTime
+        FROM
+            basic_user_course a
+                LEFT JOIN
+            basic_course b ON a.course_id = b.id
+        WHERE
+            a.school_id = #{schoolId} AND b.code = #{courseCode}
+    </select>
 
 </mapper>