fix

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

@@ -21,7 +21,6 @@ import com.qmth.boot.tools.iterator.PageListIterator;
 
 import cn.com.qmth.scancentral.controller.BaseController;
 import cn.com.qmth.scancentral.service.ExamRoomService;
-import cn.com.qmth.scancentral.service.StudentService;
 import cn.com.qmth.scancentral.vo.examroom.ExamRoomScannedQuery;
 import cn.com.qmth.scancentral.vo.examroom.ExamRoomScannedVo;
 import io.swagger.annotations.Api;
@@ -33,9 +32,6 @@ import io.swagger.annotations.ApiOperation;
 @Aac(strict = false, auth = true)
 public class ExamRoomController extends BaseController {
 
-    @Autowired
-    private StudentService studentService;
-
     @Autowired
     private ExamRoomService examRoomService;
 
@@ -59,7 +55,7 @@ public class ExamRoomController extends BaseController {
             public Collection<ExamRoomScannedVo> getPageList(int pageNumber, int pageSize) {
                 query.setPageNumber(pageNumber);
                 query.setPageSize(pageSize);
-                return studentService.examRoomScannedList(query);
+                return examRoomService.examRoomScannedList(query);
             }
         };
         writer.writeObjects("考场答题卡扫描状态", null, ExamRoomScannedVo.class, iterator);

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

@@ -25,8 +25,6 @@ import cn.com.qmth.scancentral.vo.answerquery.AnswerQueryParam;
 import cn.com.qmth.scancentral.vo.answerquery.AnswerQueryVo;
 import cn.com.qmth.scancentral.vo.assginedcheck.AssignedCheckExamRoomExport;
 import cn.com.qmth.scancentral.vo.assginedcheck.AssignedCheckExport;
-import cn.com.qmth.scancentral.vo.examroom.ExamRoomScannedQuery;
-import cn.com.qmth.scancentral.vo.examroom.ExamRoomScannedVo;
 import cn.com.qmth.scancentral.vo.imagecheck.ImageCheckDetailVo;
 import cn.com.qmth.scancentral.vo.imagecheck.ImageCheckQuery;
 import cn.com.qmth.scancentral.vo.imagecheck.ImageCheckVo;
@@ -97,9 +95,6 @@ public interface StudentDao extends BaseMapper<StudentEntity> {
 
     List<SubjectScanProgressVo> scanProgress(@Param("examId") Long examId, @Param("subjectCode") String subjectCode);
 
-    IPage<ExamRoomScannedVo> examRoomScannedPage(Page<ExamRoomScannedVo> page,
-            @Param("req") ExamRoomScannedQuery query);
-
     IPage<StudentPageVo> studentPage(Page<StudentPageVo> page, @Param("req") StudentPageQuery query);
 
     IPage<StudentVo> studentExport(Page<StudentVo> page, @Param("query") AnswerQueryDomain query);

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

@@ -1,5 +1,6 @@
 package cn.com.qmth.scancentral.service;
 
+import java.util.Collection;
 import java.util.List;
 
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -29,4 +30,6 @@ public interface ExamRoomService extends IService<ExamRoomEntity> {
 
     List<String> listExamRoomByExamId(Long examId);
 
+    Collection<ExamRoomScannedVo> examRoomScannedList(ExamRoomScannedQuery query);
+
 }

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

@@ -51,8 +51,6 @@ import cn.com.qmth.scancentral.vo.assginedcheck.AssignedTaskSaveVo;
 import cn.com.qmth.scancentral.vo.asynctask.BreachAndStatusImportTaskVo;
 import cn.com.qmth.scancentral.vo.asynctask.ExamStatusImportTaskVo;
 import cn.com.qmth.scancentral.vo.asynctask.ExamStatusResetTaskVo;
-import cn.com.qmth.scancentral.vo.examroom.ExamRoomScannedQuery;
-import cn.com.qmth.scancentral.vo.examroom.ExamRoomScannedVo;
 import cn.com.qmth.scancentral.vo.student.StudentAnswerVo;
 import cn.com.qmth.scancentral.vo.student.StudentExamRoomVo;
 import cn.com.qmth.scancentral.vo.student.StudentPageQuery;
@@ -201,10 +199,6 @@ public interface StudentService extends IService<StudentEntity> {
 
     int getUnscannedCountByExam(Long examId);
 
-    PageResult<ExamRoomScannedVo> examRoomScannedPage(ExamRoomScannedQuery query);
-
-    List<ExamRoomScannedVo> examRoomScannedList(ExamRoomScannedQuery query);
-
     PageResult<StudentPageVo> studentPage(StudentPageQuery query);
 
     List<StudentPageVo> studentList(StudentPageQuery query);

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

@@ -92,4 +92,9 @@ public class ExamRoomServiceImpl extends ServiceImpl<ExamRoomDao, ExamRoomEntity
     public List<String> listExamRoomByExamId(Long examId) {
         return this.baseMapper.listExamRoomByExamId(examId);
     }
+
+    @Override
+    public List<ExamRoomScannedVo> examRoomScannedList(ExamRoomScannedQuery query) {
+        return examRoomScannedPage(query).getResult();
+    }
 }

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

@@ -147,8 +147,6 @@ import cn.com.qmth.scancentral.vo.assginedcheck.AssignedTaskSaveVo;
 import cn.com.qmth.scancentral.vo.asynctask.BreachAndStatusImportTaskVo;
 import cn.com.qmth.scancentral.vo.asynctask.ExamStatusImportTaskVo;
 import cn.com.qmth.scancentral.vo.asynctask.ExamStatusResetTaskVo;
-import cn.com.qmth.scancentral.vo.examroom.ExamRoomScannedQuery;
-import cn.com.qmth.scancentral.vo.examroom.ExamRoomScannedVo;
 import cn.com.qmth.scancentral.vo.paper.PaperCetVo;
 import cn.com.qmth.scancentral.vo.paper.PaperPageCetVo;
 import cn.com.qmth.scancentral.vo.student.StudentAnswerVo;
@@ -2198,29 +2196,6 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, StudentEntity> i
         return this.baseMapper.scanProgress(examId, subjectCode);
     }
 
-    @Override
-    public PageResult<ExamRoomScannedVo> examRoomScannedPage(ExamRoomScannedQuery query) {
-        // 查询考生分页信息
-        IPage<ExamRoomScannedVo> iPage = baseMapper
-                .examRoomScannedPage(new Page<>(query.getPageNumber(), query.getPageSize()), query);
-        if (CollectionUtils.isNotEmpty(iPage.getRecords())) {
-            for (ExamRoomScannedVo vo : iPage.getRecords()) {
-                if (!vo.getScanned()) {
-                    vo.setScannedText("未扫描");
-                } else {
-                    vo.setScannedText("已扫描");
-                }
-                vo.setExamSite(vo.getExamSite() + "-" + vo.getExamSiteName());
-            }
-        }
-        return PageUtil.of(iPage);
-    }
-
-    @Override
-    public List<ExamRoomScannedVo> examRoomScannedList(ExamRoomScannedQuery query) {
-        return examRoomScannedPage(query).getResult();
-    }
-
     @Override
     public PageResult<StudentPageVo> studentPage(StudentPageQuery query) {
         // 查询考生分页信息

src/main/resources/mapper/StudentMapper.xml

@@ -601,40 +601,6 @@
         </if>
         group by t.subject_code
     </select>
-    <select id="examRoomScannedPage" resultType="cn.com.qmth.scancentral.vo.examroom.ExamRoomScannedVo">
-        select tm.* from(
-        select t.subject_code,s.name subjectName,t.campus_code,t.exam_site,t.exam_site_name,t.exam_room,
-        sum(case when t.status='SCANNED' then 1 else 0 end) scannedCount
-        from sc_student t inner join sc_subject s on t.exam_id=s.exam_id and t.subject_code=s.code
-        where t.exam_id=#{req.examId}
-        <if test="req.campusCode != null and req.campusCode !=''">
-            and t.campus_code=#{req.campusCode}
-        </if>
-        <if test="req.subjectCode != null and req.subjectCode !=''">
-            and t.subject_code=#{req.subjectCode}
-        </if>
-        <if test="req.examSite != null and req.examSite !=''">
-            and t.exam_site=#{req.examSite}
-        </if>
-        <if test="req.examRoom != null and req.examRoom !=''">
-            and t.exam_room=#{req.examRoom}
-        </if>
-        <if test="req.province != null and req.province !=''">
-            and t.province=#{req.province}
-        </if>
-        group by t.subject_code,t.campus_code,t.exam_site,t.exam_site_name,t.exam_room
-        ) tm
-        where 1=1
-        <if test="req.scanned != null">
-            <if test="req.scanned">
-                and tm.scannedCount>0
-            </if>
-            <if test="!req.scanned">
-                and tm.scannedCount=0
-            </if>
-        </if>
-        order by tm.subject_code,tm.subjectName,tm.campus_code,tm.exam_site,tm.exam_room
-    </select>
     <select id="studentPage" resultType="cn.com.qmth.scancentral.vo.student.StudentPageVo">
         select t.*,ss.device_name,su.name subjectName
         from sc_student t