bug

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

@@ -50,12 +50,13 @@ public class BasicStudentServiceImpl extends ServiceImpl<BasicStudentMapper, Bas
     private BasicClazzService basicClazzService;
 
     @Override
-    public IPage<BasicStudentResult> basicStudentPage(String queryParams, int pageNumber, int pageSize) {
+    public IPage<BasicStudentResult> basicStudentPage(String queryParams, Set<Long> clazzIdList,int pageNumber, int pageSize) {
         Long schoolId = SystemConstant.convertIdToLong(ServletUtil.getRequestHeaderSchoolId().toString());
 //        Set<Long> orgIds = teachcloudCommonService.listSubOrgIds(null);
         Set<Long> orgIds = null;
         queryParams = SystemConstant.translateSpecificSign(queryParams);
-        return basicStudentMapper.findBasicStudentPage(new Page<>(pageNumber, pageSize), queryParams, schoolId, orgIds);
+        // TODO: 2021/8/31 加入班级列表查询 
+        return basicStudentMapper.findBasicStudentPage(new Page<>(pageNumber, pageSize), queryParams, schoolId, clazzIdList,orgIds);
     }
 
     @Override

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

@@ -51,7 +51,7 @@ public class BasicStudentController {
     public Result findBasicStudentList(@ApiParam(value = "查询参数（学生学号或姓名）") @RequestParam(required = false) String queryParams,
                                       @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber,
                                       @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
-        return ResultUtil.ok(basicStudentService.basicStudentPage(queryParams, pageNumber, pageSize));
+        return ResultUtil.ok(basicStudentService.basicStudentPage(queryParams,null, pageNumber, pageSize));
     }
 
     @ApiOperation(value = "学生基本信息管理-新增/编辑")

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

@@ -25,6 +25,7 @@ import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.enums.TaskTypeEnum;
 import com.qmth.teachcloud.common.enums.UploadFileEnum;
 import com.qmth.teachcloud.common.service.BasicAttachmentService;
+import com.qmth.teachcloud.common.service.BasicStudentService;
 import com.qmth.teachcloud.common.service.TBTaskService;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
@@ -86,6 +87,9 @@ public class ExamTaskController {
     @Resource
     TaskService taskService;
 
+    @Resource
+    private BasicStudentService basicStudentService;
+
     /**
      * 命题任务管理-查询
      *
@@ -701,7 +705,8 @@ public class ExamTaskController {
     public Result listTaskPrintStudent(@RequestParam(value = "classId") String classId,
                                        @RequestParam Integer pageNumber,
                                        @RequestParam Integer pageSize) {
-        return ResultUtil.ok(examTaskPrintService.listStudentByClass(classId, pageNumber, pageSize));
+        Set<Long> classIds = Arrays.stream(classId.split(",")).map(SystemConstant::convertIdToLong).collect(Collectors.toSet());
+        return ResultUtil.ok(basicStudentService.basicStudentPage(null,classIds,pageNumber,pageSize));
     }
 
     /**

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

@@ -25,7 +25,8 @@ public interface BasicStudentMapper extends BaseMapper<BasicStudent> {
     List<TaskPrintClassDto> listByClass(@Param("schoolId") Long schoolId, @Param("stringList") Set<String> stringList);
 
     IPage<BasicStudentResult> findBasicStudentPage(@Param("iPage") Page<BasicStudentResult> iPage,
-                                                @Param("queryParams") String queryParams,
-                                                @Param("schoolId") Long schoolId,
-                                                @Param("orgIds") Set<Long> orgIds);
+                                                   @Param("queryParams") String queryParams,
+                                                   @Param("schoolId") Long schoolId,
+                                                   @Param("clazzIdList") Set<Long> clazzIdList,
+                                                   @Param("orgIds") Set<Long> orgIds);
 }

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

@@ -30,11 +30,12 @@ public interface BasicStudentService extends IService<BasicStudent> {
     /**
      * 学生基础信息分页查询
      * @param queryParams 查询参数（学生学号或姓名）
+     * @param clazzIdList 班级主键集合
      * @param pageNumber 分页页码
      * @param pageSize 分页容量
      * @return 分页结果
      */
-    IPage<BasicStudentResult> basicStudentPage(String queryParams,int pageNumber,int pageSize);
+    IPage<BasicStudentResult> basicStudentPage(String queryParams,Set<Long> clazzIdList, int pageNumber,int pageSize);
 
     /**
      * 新增/编辑 学生基础信息

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

@@ -26,7 +26,7 @@
                 AND clz.school_id = #{schoolId}
             </if>
             <if test="queryParams != null and queryParams != ''">
-                AND clz.clazz_name LIKE CONCAT('%',#{queryParams},'%') OR clz.clazz_code LIKE CONCAT('%',#{queryParams},'%')
+                AND (clz.clazz_name LIKE CONCAT('%',#{queryParams},'%') OR clz.clazz_code LIKE CONCAT('%',#{queryParams},'%'))
             </if>
             <if test="orgIds != null">
                 AND clz.org_id IN

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

@@ -46,11 +46,17 @@
         <where>
             and stu.enable = true
             <if test="queryParams != null and queryParams != ''">
-                and student_name like concat('%',#{queryParams},'%') or student_code like concat('%',#{queryParams},'%')
+                and (student_name like concat('%',#{queryParams},'%') or student_code like concat('%',#{queryParams},'%'))
             </if>
             <if test="schoolId != null and schoolId > 0">
                 and stu.school_id = #{schoolId}
             </if>
+            <if test="clazzIdList != null">
+                AND stu.clazz_id IN
+                <foreach collection="clazzIdList" item="item" index="index" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
             <if test="orgIds != null">
                 AND stu.org_id IN
                 <foreach collection="orgIds" item="item" index="index" open="(" separator="," close=")">