master

themis-backend/src/main/java/com/qmth/themis/backend/api/TEExamStudentController.java

@@ -13,7 +13,6 @@ import com.qmth.themis.business.dto.response.TEExamStudentDto;
 import com.qmth.themis.business.entity.*;
 import com.qmth.themis.business.enums.*;
 import com.qmth.themis.business.service.*;
-import com.qmth.themis.business.util.JacksonUtil;
 import com.qmth.themis.business.util.ServletUtil;
 import com.qmth.themis.common.enums.ExceptionResultEnum;
 import com.qmth.themis.common.exception.BusinessException;
@@ -72,11 +71,11 @@ public class TEExamStudentController {
     @ApiOperation(value = "考生查询接口")
     @RequestMapping(value = "/query", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "考生信息", response = TEExamStudentDto.class)})
-    public Result query(@ApiParam(value = "考试批次id", required = true) @RequestParam Long examId, @ApiParam(value = "考试场次id", required = false) @RequestParam(required = false) Long activityId, @ApiParam(value = "证件号", required = false) @RequestParam(required = false) String identity, @ApiParam(value = "姓名", required = false) @RequestParam(required = false) String name, @ApiParam(value = "考场代码", required = false) @RequestParam(required = false) String roomCode, @ApiParam(value = "科目代码", required = false) @RequestParam(required = false) String courseCode, @ApiParam(value = "年级", required = false) @RequestParam(required = false) String grade, @ApiParam(value = "是否启用", required = false) @RequestParam(required = false) Integer enable, @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber, @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
+    public Result query(@ApiParam(value = "考试批次id", required = true) @RequestParam Long examId, @ApiParam(value = "考试场次id", required = false) @RequestParam(required = false) Long activityId, @ApiParam(value = "证件号", required = false) @RequestParam(required = false) String identity, @ApiParam(value = "姓名", required = false) @RequestParam(required = false) String name, @ApiParam(value = "考场代码", required = false) @RequestParam(required = false) String roomCode, @ApiParam(value = "科目代码", required = false) @RequestParam(required = false) String courseCode, @ApiParam(value = "年级", required = false) @RequestParam(required = false) String grade, @ApiParam(value = "是否启用", required = false) @RequestParam(required = false) Integer enable, @ApiParam(value = "教学班级", required = false) @RequestParam(required = false) String classNo, @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber, @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
         if (Objects.isNull(examId) || Objects.equals(examId, "")) {
             throw new BusinessException(ExceptionResultEnum.EXAM_ID_IS_NULL);
         }
-        IPage<TEExamStudentDto> teExamStudentIPage = teExamStudentService.examStudentQuery(new Page<>(pageNumber, pageSize), examId, activityId, identity, name, roomCode, courseCode, grade, enable);
+        IPage<TEExamStudentDto> teExamStudentIPage = teExamStudentService.examStudentQuery(new Page<>(pageNumber, pageSize), examId, activityId, identity, name, roomCode, courseCode, grade, enable, classNo);
         BasePage basePage = new BasePage(teExamStudentIPage.getRecords(), teExamStudentIPage.getCurrent(), teExamStudentIPage.getSize(), teExamStudentIPage.getTotal());
         return ResultUtil.ok(basePage);
     }

themis-business/src/main/java/com/qmth/themis/business/dao/TEExamStudentMapper.java

@@ -1,15 +1,14 @@
 package com.qmth.themis.business.dao;
 
-import java.util.List;
-import java.util.Map;
-
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.qmth.themis.business.dto.response.TEExamStudentDto;
 import com.qmth.themis.business.entity.TEExamStudent;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Description: 考生库 Mapper 接口
@@ -21,25 +20,26 @@ import com.qmth.themis.business.entity.TEExamStudent;
 @Mapper
 public interface TEExamStudentMapper extends BaseMapper<TEExamStudent> {
 
-	/**
-	 * 查询考生信息
-	 *
-	 * @param iPage
-	 * @param examId
-	 * @param activityId
-	 * @param identity
-	 * @param name
-	 * @param roomCode
-	 * @param courseCode
-	 * @param grade
-	 * @param enable
-	 * @return
-	 */
-	public IPage<TEExamStudentDto> examStudentQuery(IPage<Map> iPage, @Param("examId") Long examId,
-			@Param("activityId") Long activityId, @Param("identity") String identity, @Param("name") String name,
-			@Param("roomCode") String roomCode, @Param("courseCode") String courseCode, @Param("grade") String grade,
-			@Param("enable") Integer enable);
+    /**
+     * 查询考生信息
+     *
+     * @param iPage
+     * @param examId
+     * @param activityId
+     * @param identity
+     * @param name
+     * @param roomCode
+     * @param courseCode
+     * @param grade
+     * @param enable
+     * @param classNo
+     * @return
+     */
+    public IPage<TEExamStudentDto> examStudentQuery(IPage<Map> iPage, @Param("examId") Long examId,
+                                                    @Param("activityId") Long activityId, @Param("identity") String identity, @Param("name") String name,
+                                                    @Param("roomCode") String roomCode, @Param("courseCode") String courseCode, @Param("grade") String grade,
+                                                    @Param("enable") Integer enable, @Param("classNo") String classNo);
 
-	public List<Map<String,Object>> getTotalCount(@Param("examId") Long examId, @Param("activityId") Long activityId,
-			@Param("roomCode") String roomCode,@Param("courseCode")  String courseCode);
+    public List<Map<String, Object>> getTotalCount(@Param("examId") Long examId, @Param("activityId") Long activityId,
+                                                   @Param("roomCode") String roomCode, @Param("courseCode") String courseCode);
 }

themis-business/src/main/java/com/qmth/themis/business/service/TEExamStudentService.java

@@ -29,9 +29,10 @@ public interface TEExamStudentService extends IService<TEExamStudent> {
      * @param courseCode
      * @param grade
      * @param enable
+     * @param classNo
      * @return
      */
-    public IPage<TEExamStudentDto> examStudentQuery(IPage<Map> iPage, Long examId, Long activityId, String identity, String name, String roomCode, String courseCode, String grade, Integer enable);
+    public IPage<TEExamStudentDto> examStudentQuery(IPage<Map> iPage, Long examId, Long activityId, String identity, String name, String roomCode, String courseCode, String grade, Integer enable, String classNo);
 
     ExamStudentCacheBean getExamStudentCacheBean(Long examStudentId);
 

themis-business/src/main/java/com/qmth/themis/business/service/impl/TEExamStudentServiceImpl.java

@@ -40,11 +40,12 @@ public class TEExamStudentServiceImpl extends ServiceImpl<TEExamStudentMapper, T
      * @param courseCode
      * @param grade
      * @param enable
+     * @param classNo
      * @return
      */
     @Override
-    public IPage<TEExamStudentDto> examStudentQuery(IPage<Map> iPage, Long examId, Long activityId, String identity, String name, String roomCode, String courseCode, String grade, Integer enable) {
-        return teExamStudentMapper.examStudentQuery(iPage, examId, activityId, identity, name, roomCode, courseCode, grade, enable);
+    public IPage<TEExamStudentDto> examStudentQuery(IPage<Map> iPage, Long examId, Long activityId, String identity, String name, String roomCode, String courseCode, String grade, Integer enable, String classNo) {
+        return teExamStudentMapper.examStudentQuery(iPage, examId, activityId, identity, name, roomCode, courseCode, grade, enable, classNo);
     }
 
     @Cacheable(value = "exam_student", key = "#examStudentId", unless = "#result == null")

themis-business/src/main/resources/mapper/TEExamStudentMapper.xml

@@ -50,7 +50,10 @@
                 and tees.enable = #{enable}
             </if>
             <if test="grade != null and grade != ''">
-                and tees.grade = #{grade}
+                and tees.grade like concat('%', #{grade}, '%')
+            </if>
+            <if test="classNo != null and classNo != ''">
+                and tees.class_no like concat('%', #{classNo}, '%')
             </if>
         </where>
     </select>