fix

src/main/java/cn/com/qmth/scancentral/controller/admin/ExamWorkController.java

@@ -52,7 +52,7 @@ public class ExamWorkController {
         return subjectService.findByExamIdAndCode(examId, code);
     }
 
-    @ApiOperation(value = "获取所有学习中心")
+    @ApiOperation(value = "获取所有校区")
     @RequestMapping(value = "/campus/list", method = RequestMethod.POST)
     public List<CampusVo> campusList(@RequestParam Long examId) {
         return studentService.listCampusByExamId(examId);
@@ -63,4 +63,16 @@ public class ExamWorkController {
     public List<ExamSiteVo> siteList(@RequestParam Long examId) {
         return studentService.listSiteByExamId(examId);
     }
+
+    @ApiOperation(value = "获取所有省份")
+    @RequestMapping(value = "province/list", method = RequestMethod.POST)
+    public List<String> provinceList(@RequestParam Long examId) {
+        return studentService.listProvinceByExamId(examId);
+    }
+
+    @ApiOperation(value = "获取所有考场号")
+    @RequestMapping(value = "exam-room/list", method = RequestMethod.POST)
+    public List<String> examRoomList(@RequestParam Long examId) {
+        return studentService.listExamRoomByExamId(examId);
+    }
 }

src/main/java/cn/com/qmth/scancentral/dao/StudentDao.java

@@ -79,11 +79,11 @@ public interface StudentDao extends BaseMapper<StudentEntity> {
 
     IPage<AnswerQueryVo> queryAssignedCheckPage(Page<AnswerQueryVo> page, @Param("query") AssignedQueryDomain query);
 
-    IPage<AnswerQueryVo> findUnCheck(Page<AnswerQueryVo> page,@Param("examId") Long examId, @Param("subjectCode") String subjectCode,
-                                    @Param("checkCount") int checkCount);
+    IPage<AnswerQueryVo> findUnCheck(Page<AnswerQueryVo> page, @Param("examId") Long examId,
+            @Param("subjectCode") String subjectCode, @Param("checkCount") int checkCount);
 
-    IPage<AnswerQueryVo> getAssignedCheckTaskHistory(Page<AnswerQueryVo> page,@Param("examId") Long examId, @Param("subjectCode") String subjectCode,
-            @Param("userId") Long userId);
+    IPage<AnswerQueryVo> getAssignedCheckTaskHistory(Page<AnswerQueryVo> page, @Param("examId") Long examId,
+            @Param("subjectCode") String subjectCode, @Param("userId") Long userId);
 
     void updateAssignedCheckCount(@Param("id") Long id);
 
@@ -111,4 +111,9 @@ public interface StudentDao extends BaseMapper<StudentEntity> {
             @Param("subjectCode") String subjectCode);
 
     StudentAnswerVo getStudentVo(@Param("studentId") Long studentId);
+
+    List<String> listProvinceByExamId(@Param("examId") Long examId);
+
+    List<String> listExamRoomByExamId(@Param("examId") Long examId);
+
 }

src/main/java/cn/com/qmth/scancentral/entity/StudentEntity.java

@@ -27,18 +27,25 @@ public class StudentEntity extends AuditingWithoutIdEntity {
 
     private String subjectCode;
 
+    // 卷袋编号
     private String packageCode;
 
+    // 考点
     private String examSite;
 
+    // 考点名称
     private String examSiteName;
 
+    // 考场
     private String examRoom;
 
+    // 座位号
     private String seatNumber;
 
+    // 校区名称
     private String campusName;
 
+    // 校区代码
     private String campusCode;
 
     // 省份

src/main/java/cn/com/qmth/scancentral/service/StudentService.java

@@ -240,4 +240,8 @@ public interface StudentService extends IService<StudentEntity> {
     void custStatusImportDispose(BreachAndStatusImportTaskVo vo);
 
     boolean existUncheck(Long examId, String subjectCode);
+
+    List<String> listProvinceByExamId(Long examId);
+
+    List<String> listExamRoomByExamId(Long examId);
 }

src/main/java/cn/com/qmth/scancentral/service/impl/StudentServiceImpl.java

@@ -2594,4 +2594,14 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, StudentEntity> i
         return this.getOne(wrapper) != null;
     }
 
+    @Override
+    public List<String> listProvinceByExamId(Long examId) {
+        return this.baseMapper.listProvinceByExamId(examId);
+    }
+
+    @Override
+    public List<String> listExamRoomByExamId(Long examId) {
+        return this.baseMapper.listExamRoomByExamId(examId);
+    }
+
 }

src/main/resources/mapper/StudentMapper.xml

@@ -1,7 +1,28 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="cn.com.qmth.scancentral.dao.StudentDao">
-
+    <select id="listProvinceByExamId" resultType="string">
+        SELECT
+        distinct s.province 
+        FROM
+        sc_student s
+        <where>
+            s.exam_id = #{examId}
+            and s.province is not null
+            and s.province !=''
+        </where>
+    </select>
+    <select id="listExamRoomByExamId" resultType="string">
+        SELECT
+        distinct s.exam_room 
+        FROM
+        sc_student s
+        <where>
+            s.exam_id = #{examId}
+            and s.exam_room is not null
+            and s.exam_room !=''
+        </where>
+    </select>
     <select id="listCampusByExamId" resultType="cn.com.qmth.scancentral.vo.CampusVo">
         SELECT
         s.campus_name name,