监考端接口

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

@@ -86,11 +86,7 @@ public class SysController {
         if (Objects.isNull(tbUser)) {
             throw new BusinessException(ExceptionResultEnum.LOGIN_NO);
         }
-        List<TBPrivilege> tbPrivilegeList = tbPrivilegeService.getMenu(tbUser.getId());
-        ;
-        Map map = new HashMap();
-        map.put(SystemConstant.RECORDS, tbPrivilegeList);
-        return ResultUtil.ok(map);
+        return ResultUtil.ok(tbPrivilegeService.getMenu(tbUser.getId()));
     }
 
     @ApiOperation(value = "获取环境接口")
@@ -226,10 +222,7 @@ public class SysController {
         if (Objects.nonNull(enable)) {
             tbOrgQueryWrapper.lambda().eq(TBOrg::getEnable, enable);
         }
-        List<TBOrg> tbOrgList = tbOrgService.list(tbOrgQueryWrapper);
-        Map map = new HashMap<>();
-        map.put(SystemConstant.RECORDS, tbOrgList);
-        return ResultUtil.ok(map);
+        return ResultUtil.ok(tbOrgService.list(tbOrgQueryWrapper));
     }
 
     @ApiOperation(value = "角色查询接口")
@@ -245,19 +238,14 @@ public class SysController {
                 EhcacheUtil.put(SystemConstant.roleCache, SystemConstant.roleCache, tbRoleList);
             }
         }
-        Map map = new HashMap();
-        map.put(SystemConstant.RECORDS, tbRoleList);
-        return ResultUtil.ok(map);
+        return ResultUtil.ok(tbRoleList);
     }
 
     @ApiOperation(value = "考试场次查询接口")
     @RequestMapping(value = "/examActivity/query", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "角色信息", response = TEExamActivity.class)})
     public Result examActivityQuery() {
-        List<TEExamActivity> teExamActivityList = teExamActivityService.list();
-        Map map = new HashMap();
-        map.put(SystemConstant.RECORDS, teExamActivityList);
-        return ResultUtil.ok(map);
+        return ResultUtil.ok(teExamActivityService.list());
     }
 
     @ApiOperation(value = "考试批次查询接口")
@@ -271,18 +259,13 @@ public class SysController {
             teExamQueryDtoList = gson.fromJson(gson.toJson(teExamList), new TypeToken<List<TEExamQueryDto>>() {
             }.getType());
         }
-        Map map = new HashMap();
-        map.put(SystemConstant.RECORDS, teExamQueryDtoList);
-        return ResultUtil.ok(map);
+        return ResultUtil.ok(teExamQueryDtoList);
     }
 
     @ApiOperation(value = "考场查询接口")
     @RequestMapping(value = "/examRoom/query", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "角色信息", response = RoomCodeQueryDto.class)})
     public Result examRoomQuery(@ApiParam(value = "考场名称", required = false) @RequestParam(required = false) String roomName) {
-        List<RoomCodeQueryDto> roomCodeQueryDtoList = tbExamInvigilateUserService.examRoomQuery(roomName);
-        Map map = new HashMap();
-        map.put(SystemConstant.RECORDS, roomCodeQueryDtoList);
-        return ResultUtil.ok(map);
+        return ResultUtil.ok(tbExamInvigilateUserService.examRoomQuery(roomName));
     }
 }

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

@@ -65,9 +65,7 @@ public class TBExamInvigilateUserController {
     public Result query(@ApiParam(value = "考场代码", required = false) @RequestParam(required = false) String roomCode, @ApiParam(value = "用户id", required = false) @RequestParam(required = false) Long userId, @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber, @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
         IPage<TBExamInvigilateUserDto> examInvigilateUserDtoIPage = tbExamInvigilateUserService.examInvigilateUserQuery(new Page<>(pageNumber, pageSize), roomCode, userId);
         BasePage basePage = new BasePage(examInvigilateUserDtoIPage.getRecords(), examInvigilateUserDtoIPage.getCurrent(), examInvigilateUserDtoIPage.getSize(), examInvigilateUserDtoIPage.getTotal());
-        Map map = new HashMap<>();
-        map.put(SystemConstant.RECORDS, basePage);
-        return ResultUtil.ok(map);
+        return ResultUtil.ok(basePage);
     }
 
     @ApiOperation(value = "监考员修改接口")

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

@@ -58,9 +58,7 @@ public class TBOrgController {
     public Result queryByPage(@ApiParam(value = "机构代码", required = false) @RequestParam(required = false) String code, @ApiParam(value = "机构名称", required = false) @RequestParam(required = false) String name, @ApiParam(value = "是否启用", required = false) @RequestParam(required = false) Integer enable, @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber, @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
         IPage<TBOrgDto> tborgIPage = tbOrgService.queryByPage(new Page<>(pageNumber, pageSize), code, name, enable);
         BasePage basePage = new BasePage(tborgIPage.getRecords(), tborgIPage.getCurrent(), tborgIPage.getSize(), tborgIPage.getTotal());
-        Map map = new HashMap<>();
-        map.put(SystemConstant.RECORDS, basePage);
-        return ResultUtil.ok(map);
+        return ResultUtil.ok(basePage);
     }
 
     //    @CacheEvict(value = "org_cache", key = "'orgCacheQuery'")

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

@@ -44,8 +44,6 @@ public class TBTaskHistoryController {
     public Result query(@ApiParam(value = "任务id", required = false) @RequestParam(required = false) Long id, @ApiParam(value = "业务对象id", required = false) @RequestParam(required = false) Long entityId, @ApiParam(value = "任务类型", required = false) @RequestParam(required = false) TaskTypeEnum type, @ApiParam(value = "任务状态", required = false) @RequestParam(required = false) TaskStatusEnum status, @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber, @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
         IPage<TBTaskDto> taskDtoIPage = tbTaskHistoryService.taskQuery(new Page<>(pageNumber, pageSize), id, entityId, type, status);
         BasePage basePage = new BasePage(taskDtoIPage.getRecords(), taskDtoIPage.getCurrent(), taskDtoIPage.getSize(), taskDtoIPage.getTotal());
-        Map map = new HashMap<>();
-        map.put(SystemConstant.RECORDS, basePage);
-        return ResultUtil.ok(map);
+        return ResultUtil.ok(basePage);
     }
 }

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

@@ -549,9 +549,7 @@ public class TBUserController {
                 s.setRoleCode(Arrays.asList(s.getRoleCodeStr().split(",")));
             }
         });
-        Map map = new HashMap<>();
-        map.put(SystemConstant.RECORDS, basePage);
-        return ResultUtil.ok(map);
+        return ResultUtil.ok(basePage);
     }
 
     //    @CacheEvict(value = "user_cache", key = "'userCacheQuery'")

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

@@ -107,8 +107,6 @@ public class TEExamActivityController {
     public Result query(@ApiParam(value = "考试批次id", required = false) @RequestParam(required = false) Long examId, @ApiParam(value = "考试场次编码", required = false) @RequestParam(required = false) String code, @ApiParam(value = "开始日期", required = false) @RequestParam(required = false) String startDate, @ApiParam(value = "结束日期", required = false) @RequestParam(required = false) String finishDate, @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber, @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
         IPage<TEExamActivityQueryDto> teExamActivityIPage = teExamActivityService.examActivityQuery(new Page<>(pageNumber, pageSize), examId, code, startDate, finishDate);
         BasePage basePage = new BasePage(teExamActivityIPage.getRecords(), teExamActivityIPage.getCurrent(), teExamActivityIPage.getSize(), teExamActivityIPage.getTotal());
-        Map map = new HashMap<>();
-        map.put(SystemConstant.RECORDS, basePage);
-        return ResultUtil.ok(map);
+        return ResultUtil.ok(basePage);
     }
 }

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

@@ -210,9 +210,7 @@ public class TEExamController {
     public Result query(@ApiParam(value = "考试批次id", required = false) @RequestParam(required = false) Long id, @ApiParam(value = "考试批次编码", required = false) @RequestParam(required = false) String code, @ApiParam(value = "考试批次名称", required = false) @RequestParam(required = false) String name, @ApiParam(value = "考试批次模式", required = false) @RequestParam(required = false) Integer mode, @ApiParam(value = "是否启用", required = false) @RequestParam(required = false) Integer enable, @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber, @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
         IPage<TEExamQueryDto> teExamQueryDtoIPage = teExamService.examQuery(new Page<>(pageNumber, pageSize), id, code, name, mode, enable);
         BasePage basePage = new BasePage(teExamQueryDtoIPage.getRecords(), teExamQueryDtoIPage.getCurrent(), teExamQueryDtoIPage.getSize(), teExamQueryDtoIPage.getTotal());
-        Map map = new HashMap<>();
-        map.put(SystemConstant.RECORDS, basePage);
-        return ResultUtil.ok(map);
+        return ResultUtil.ok(basePage);
     }
 
     @ApiOperation(value = "考试批次停用/启用接口")
@@ -254,10 +252,7 @@ public class TEExamController {
         if (Objects.isNull(teExam)) {
             throw new BusinessException(ExceptionResultEnum.EXAM_NO);
         }
-        TEExamDto teExamDto = new TEExamDto(teExam);
-        Map map = new HashMap<>();
-        map.put(SystemConstant.RECORDS, teExamDto);
-        return ResultUtil.ok(map);
+        return ResultUtil.ok(new TEExamDto(teExam));
     }
 
     @ApiOperation(value = "考试批次复制接口")
@@ -333,9 +328,7 @@ public class TEExamController {
         }
         IPage<TEExamQueryDto> teExamQueryDtoIPage = teExamService.examList(new Page<>(pageNumber, pageSize), tbUser.getOrgId());
         BasePage basePage = new BasePage(teExamQueryDtoIPage.getRecords(), teExamQueryDtoIPage.getCurrent(), teExamQueryDtoIPage.getSize(), teExamQueryDtoIPage.getTotal());
-        Map map = new HashMap<>();
-        map.put(SystemConstant.RECORDS, basePage);
-        return ResultUtil.ok(map);
+        return ResultUtil.ok(basePage);
     }
 
     @ApiOperation(value = "考试属性统计接口")

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

@@ -83,8 +83,6 @@ public class TEExamCourseController {
         }
         IPage<TEExamCourseDto> examCourseIPage = teExamCourseService.examCourseQuery(new Page<>(pageNumber, pageSize), id, examId, courseCode, courseName, hasPaper);
         BasePage basePage = new BasePage(examCourseIPage.getRecords(), examCourseIPage.getCurrent(), examCourseIPage.getSize(), examCourseIPage.getTotal());
-        Map map = new HashMap<>();
-        map.put(SystemConstant.RECORDS, basePage);
-        return ResultUtil.ok(map);
+        return ResultUtil.ok(basePage);
     }
 }

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

@@ -67,10 +67,7 @@ public class TEExamPaperController {
         }
         QueryWrapper<TEExamPaper> teExamPaperQueryWrapper = new QueryWrapper<>();
         teExamPaperQueryWrapper.lambda().eq(TEExamPaper::getExamId, examId).eq(TEExamPaper::getCourseCode, courseCode);
-        List<TEExamPaper> teExamPaperList = teExamPaperService.list(teExamPaperQueryWrapper);
-        Map<String, List<TEExamPaper>> map = new HashMap<String, List<TEExamPaper>>();
-        map.put(SystemConstant.RECORDS, teExamPaperList);
-        return ResultUtil.ok(map);
+        return ResultUtil.ok(teExamPaperService.list(teExamPaperQueryWrapper));
     }
 
     @ApiOperation(value = "考试试卷参数修改接口")

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

@@ -5,7 +5,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qmth.themis.business.annotation.ApiJsonObject;
 import com.qmth.themis.business.annotation.ApiJsonProperty;
 import com.qmth.themis.business.base.BasePage;
-import com.qmth.themis.business.bean.backend.ReexamListNotDongBean;
+import com.qmth.themis.business.bean.backend.ReexamListDoneBean;
+import com.qmth.themis.business.bean.backend.ReexamListNotDoneBean;
 import com.qmth.themis.business.bean.backend.ReexamListRequestBean;
 import com.qmth.themis.business.cache.RedisKeyHelper;
 import com.qmth.themis.business.cache.bean.ExamCacheBean;
@@ -221,9 +222,7 @@ public class TEExamReexamController {
         }
         IPage<ReexamListRequestBean> reexamListRequestBeanIPage = teExamReexamService.reexamPageRequestList(new Page<>(pageNumber, pageSize), examId, examActivityId, roomCode, courseCode, name, identity, userId);
         BasePage basePage = new BasePage(reexamListRequestBeanIPage.getRecords(), reexamListRequestBeanIPage.getCurrent(), reexamListRequestBeanIPage.getSize(), reexamListRequestBeanIPage.getTotal());
-        Map map = new HashMap<>();
-        map.put(SystemConstant.RECORDS, basePage);
-        return ResultUtil.ok(map);
+        return ResultUtil.ok(basePage);
     }
 
     @ApiOperation(value = "重考待审列表接口")
@@ -245,9 +244,9 @@ public class TEExamReexamController {
             throw new BusinessException(ExceptionResultEnum.EXAM_ID_IS_NULL);
         }
         TBUser tbUser = (TBUser) ServletUtil.getRequestAccount();
-        IPage<ReexamListNotDongBean> reexamListNotDongBeanIPage = teExamReexamService.reexamPageNotDoneList(new Page<>(pageNumber, pageSize), examId, examActivityId, roomCode, courseCode, name, identity, reason, reasonStartTime, reasonEndTime, applyName, tbUser.getId());
+        IPage<ReexamListNotDoneBean> reexamListNotDongBeanIPage = teExamReexamService.reexamPageNotDoneList(new Page<>(pageNumber, pageSize), examId, examActivityId, roomCode, courseCode, name, identity, reason, reasonStartTime, reasonEndTime, applyName, tbUser.getId());
         BasePage basePage = new BasePage(reexamListNotDongBeanIPage.getRecords(), reexamListNotDongBeanIPage.getCurrent(), reexamListNotDongBeanIPage.getSize(), reexamListNotDongBeanIPage.getTotal());
-        return ResultUtil.ok(Collections.singletonMap(SystemConstant.RECORDS, basePage));
+        return ResultUtil.ok(basePage);
     }
 
     @ApiOperation(value = "重考已审列表接口")
@@ -259,20 +258,18 @@ public class TEExamReexamController {
                            @ApiParam(value = "科目代码", required = false) @RequestParam(required = false) String courseCode,
                            @ApiParam(value = "姓名", required = false) @RequestParam(required = false) String name,
                            @ApiParam(value = "证件号", required = false) @RequestParam(required = false) String identity,
+                           @ApiParam(value = "审核状态", required = false) @RequestParam(required = false) Integer auditingStatus,
+                           @ApiParam(value = "申请开始时间", required = false) @RequestParam(required = false) String reasonStartTime,
+                           @ApiParam(value = "申请结束时间", required = false) @RequestParam(required = false) String reasonEndTime,
+                           @ApiParam(value = "申请人", required = false) @RequestParam(required = false) String applyName,
                            @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);
         }
         TBUser tbUser = (TBUser) ServletUtil.getRequestAccount();
-        AuthDto authDto = (AuthDto) redisUtil.get(SystemConstant.userOauth + "::" + tbUser.getId());
-        //如果有监考员角色，只能查看自己所监考的考场，巡考员和管理员则可以查看全部考场
-        Long userId = null;
-        if (authDto.getRoleCodes().toString().contains(RoleEnum.INVIGILATE.name())) {
-            userId = tbUser.getId();
-        }
-        IPage<ReexamListRequestBean> reexamListRequestBeanIPage = teExamReexamService.reexamPageRequestList(new Page<>(pageNumber, pageSize), examId, examActivityId, roomCode, courseCode, name, identity, userId);
+        IPage<ReexamListDoneBean> reexamListRequestBeanIPage = teExamReexamService.reexamPageDoneList(new Page<>(pageNumber, pageSize), examId, examActivityId, roomCode, courseCode, name, identity, auditingStatus,reasonStartTime,reasonEndTime,applyName,tbUser.getId());
         BasePage basePage = new BasePage(reexamListRequestBeanIPage.getRecords(), reexamListRequestBeanIPage.getCurrent(), reexamListRequestBeanIPage.getSize(), reexamListRequestBeanIPage.getTotal());
-        return ResultUtil.ok(Collections.singletonMap(SystemConstant.RECORDS, basePage));
+        return ResultUtil.ok(basePage);
     }
 }

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

@@ -78,9 +78,7 @@ public class TEExamStudentController {
         }
         IPage<TEExamStudentDto> teExamStudentIPage = teExamStudentService.examStudentQuery(new Page<>(pageNumber, pageSize), examId, activityId, identity, name, roomCode, courseCode, grade, enable);
         BasePage basePage = new BasePage(teExamStudentIPage.getRecords(), teExamStudentIPage.getCurrent(), teExamStudentIPage.getSize(), teExamStudentIPage.getTotal());
-        Map map = new HashMap<>();
-        map.put(SystemConstant.RECORDS, basePage);
-        return ResultUtil.ok(map);
+        return ResultUtil.ok(basePage);
     }
 
     @ApiOperation(value = "考生停用/启用接口")

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

@@ -54,9 +54,7 @@ public class TEStudentController {
     public Result query(@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) Integer enable, @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber, @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
         IPage<TEStudentDto> teExamStudentIPage = teStudentService.studentQuery(new Page<>(pageNumber, pageSize), identity, name, enable);
         BasePage basePage = new BasePage(teExamStudentIPage.getRecords(), teExamStudentIPage.getCurrent(), teExamStudentIPage.getSize(), teExamStudentIPage.getTotal());
-        Map map = new HashMap<>();
-        map.put(SystemConstant.RECORDS, basePage);
-        return ResultUtil.ok(map);
+        return ResultUtil.ok(basePage);
     }
 
     @ApiOperation(value = "学生停用/启用接口")
@@ -128,8 +126,6 @@ public class TEStudentController {
         }
         IPage<TEStudentExamRecordDto> teStudentExamRecordDtoIPage = teStudentService.studentExamRecordQuery(new Page<>(pageNumber, pageSize), studentId, examId);
         BasePage basePage = new BasePage(teStudentExamRecordDtoIPage.getRecords(), teStudentExamRecordDtoIPage.getCurrent(), teStudentExamRecordDtoIPage.getSize(), teStudentExamRecordDtoIPage.getTotal());
-        Map map = new HashMap<>();
-        map.put(SystemConstant.RECORDS, basePage);
-        return ResultUtil.ok(map);
+        return ResultUtil.ok(basePage);
     }
 }

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

@@ -62,9 +62,7 @@ public class TIeInvigilateCallMobileController {
     public Result callList(@ApiParam(value = "场次id", required = false) @RequestParam(required = false) Long examActivityId, @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber, @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
         IPage<TIeExamInvigilateCall> tIeExamInvigilateCallIPage = tIeExamInvigilateCallService.examInvigilateCallQuery(new Page<>(pageNumber, pageSize), examActivityId, MonitorStatusSourceEnum.START.name());
         BasePage basePage = new BasePage(tIeExamInvigilateCallIPage.getRecords(), tIeExamInvigilateCallIPage.getCurrent(), tIeExamInvigilateCallIPage.getSize(), tIeExamInvigilateCallIPage.getTotal());
-        Map map = new HashMap<>();
-        map.put(SystemConstant.RECORDS, basePage);
-        return ResultUtil.ok(map);
+        return ResultUtil.ok(basePage);
     }
 
     @ApiOperation(value = "监考监控通话查询来源接口")
@@ -73,10 +71,7 @@ public class TIeInvigilateCallMobileController {
     public Result callQuery(@ApiParam(value = "考试记录id", required = true) @RequestParam(required = true) Long recordId) {
         QueryWrapper<TIeExamInvigilateCall> tIeExamInvigilateCallQueryWrapper = new QueryWrapper<>();
         tIeExamInvigilateCallQueryWrapper.lambda().eq(TIeExamInvigilateCall::getExamRecordId, recordId);
-        List<TIeExamInvigilateCall> tIeExamInvigilateCallList = tIeExamInvigilateCallService.list(tIeExamInvigilateCallQueryWrapper);
-        Map map = new HashMap<>();
-        map.put(SystemConstant.RECORDS, tIeExamInvigilateCallList);
-        return ResultUtil.ok(map);
+        return ResultUtil.ok(tIeExamInvigilateCallService.list(tIeExamInvigilateCallQueryWrapper));
     }
 
     @ApiOperation(value = "撤销通话申请接口")

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

@@ -100,9 +100,7 @@ public class TIeInvigilateController {
         }
         IPage<InvigilateListBean> invigilateListBeanIPage = tOeExamRecordService.invigilatePageList(new Page<>(pageNumber, pageSize), examId, examActivityId, roomCode, paperDownload, status, name, identity, minWarningCount, maxWarningCount, clientWebsocketStatus, monitorStatusSource, userId);
         BasePage basePage = new BasePage(invigilateListBeanIPage.getRecords(), invigilateListBeanIPage.getCurrent(), invigilateListBeanIPage.getSize(), invigilateListBeanIPage.getTotal());
-        Map map = new HashMap<>();
-        map.put(SystemConstant.RECORDS, basePage);
-        return ResultUtil.ok(map);
+        return ResultUtil.ok(basePage);
     }
 
     @ApiOperation(value = "实时监控台视频列表接口")
@@ -133,9 +131,7 @@ public class TIeInvigilateController {
         }
         IPage<InvigilateListVideoBean> invigilateListVideoBeanIPage = tOeExamRecordService.invigilatePageListVideo(new Page<>(pageNumber, pageSize), examId, examActivityId, roomCode, paperDownload, status, name, identity, minWarningCount, maxWarningCount, clientWebsocketStatus, monitorStatusSource, userId);
         BasePage basePage = new BasePage(invigilateListVideoBeanIPage.getRecords(), invigilateListVideoBeanIPage.getCurrent(), invigilateListVideoBeanIPage.getSize(), invigilateListVideoBeanIPage.getTotal());
-        Map map = new HashMap<>();
-        map.put(SystemConstant.RECORDS, basePage);
-        return ResultUtil.ok(map);
+        return ResultUtil.ok(basePage);
     }
 
     @ApiOperation(value = "实时监控台列表明细接口")
@@ -271,9 +267,7 @@ public class TIeInvigilateController {
         }
         IPage<InvigilateListPatrolBean> invigilateListPatrolBeanIPage = tOeExamRecordService.invigilatePagePatrolList(new Page<>(pageNumber, pageSize), examId, examActivityId, roomCode, status, name, identity, minMultipleFaceCount, maxMultipleFaceCount, minExceptionCount, maxExceptionCount, minWarningCount, maxWarningCount, clientWebsocketStatus, monitorStatusSource, userId);
         BasePage basePage = new BasePage(invigilateListPatrolBeanIPage.getRecords(), invigilateListPatrolBeanIPage.getCurrent(), invigilateListPatrolBeanIPage.getSize(), invigilateListPatrolBeanIPage.getTotal());
-        Map map = new HashMap<>();
-        map.put(SystemConstant.RECORDS, basePage);
-        return ResultUtil.ok(map);
+        return ResultUtil.ok(basePage);
     }
 
     @ApiOperation(value = "进度查询列表接口")
@@ -299,9 +293,7 @@ public class TIeInvigilateController {
         }
         IPage<InvigilateListProgressBean> invigilateListProgressBeanIPage = tOeExamRecordService.invigilatePageProgressList(new Page<>(pageNumber, pageSize), examId, examActivityId, roomCode, courseCode, name, identity, userId);
         BasePage basePage = new BasePage(invigilateListProgressBeanIPage.getRecords(), invigilateListProgressBeanIPage.getCurrent(), invigilateListProgressBeanIPage.getSize(), invigilateListProgressBeanIPage.getTotal());
-        Map map = new HashMap<>();
-        map.put(SystemConstant.RECORDS, basePage);
-        return ResultUtil.ok(map);
+        return ResultUtil.ok(basePage);
     }
 
     @ApiOperation(value = "违纪处理接口")

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

@@ -101,8 +101,6 @@ public class TIeInvigilateWarnInfoController {
         }
         IPage<InvigilateListWarningBean> invigilateListWarningBeanIPage = tOeExamRecordService.invigilatePageWarningList(new Page<>(pageNumber, pageSize), examId, examActivityId, roomCode, approveStatus, name, identity, minMultipleFaceCount, maxMultipleFaceCount, minExceptionCount, maxExceptionCount, minWarningCount, maxWarningCount, clientWebsocketStatus, monitorStatusSource, userId);
         BasePage basePage = new BasePage(invigilateListWarningBeanIPage.getRecords(), invigilateListWarningBeanIPage.getCurrent(), invigilateListWarningBeanIPage.getSize(), invigilateListWarningBeanIPage.getTotal());
-        Map map = new HashMap<>();
-        map.put(SystemConstant.RECORDS, basePage);
-        return ResultUtil.ok(map);
+        return ResultUtil.ok(basePage);
     }
 }

themis-business/src/main/java/com/qmth/themis/business/bean/backend/ReexamListNotDongBean.java → themis-business/src/main/java/com/qmth/themis/business/bean/backend/ReexamListBean.java

@@ -7,14 +7,14 @@ import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 
 /**
- * @Description: 重考待审列表返回对象
+ * @Description: 重考列表返回对象
  * @Param:
  * @return:
  * @Author: wangliang
  * @Date: 2020/8/22
  */
-@ApiModel("重考待审列表返回对象")
-public class ReexamListNotDongBean implements Serializable {
+@ApiModel("重考列表返回对象")
+public class ReexamListBean implements Serializable {
 
     @ApiModelProperty(name = "重考id")
     private Long reexamId;

themis-business/src/main/java/com/qmth/themis/business/bean/backend/ReexamListDoneBean.java

@@ -0,0 +1,59 @@
+package com.qmth.themis.business.bean.backend;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @Description: 重考已审列表返回对象
+ * @Param:
+ * @return:
+ * @Author: wangliang
+ * @Date: 2020/8/22
+ */
+@ApiModel("重考已审列表返回对象")
+public class ReexamListDoneBean extends ReexamListBean {
+
+    @ApiModelProperty(name = "审核时间")
+    private String auditingTime;
+
+    @ApiModelProperty(name = "审核结果")
+    private Integer auditingStatus;
+
+    @ApiModelProperty(name = "审核结果")
+    private String auditingStatusStr;
+
+    @ApiModelProperty(name = "审核人")
+    private String auditingName;
+
+    public String getAuditingTime() {
+        return auditingTime;
+    }
+
+    public void setAuditingTime(String auditingTime) {
+        this.auditingTime = auditingTime;
+    }
+
+    public Integer getAuditingStatus() {
+        return auditingStatus;
+    }
+
+    public void setAuditingStatus(Integer auditingStatus) {
+        this.auditingStatus = auditingStatus;
+    }
+
+    public String getAuditingStatusStr() {
+        return auditingStatusStr;
+    }
+
+    public void setAuditingStatusStr(String auditingStatusStr) {
+        this.auditingStatusStr = auditingStatusStr;
+    }
+
+    public String getAuditingName() {
+        return auditingName;
+    }
+
+    public void setAuditingName(String auditingName) {
+        this.auditingName = auditingName;
+    }
+}

themis-business/src/main/java/com/qmth/themis/business/bean/backend/ReexamListNotDoneBean.java

@@ -0,0 +1,15 @@
+package com.qmth.themis.business.bean.backend;
+
+import io.swagger.annotations.ApiModel;
+
+/**
+ * @Description: 重考待审列表返回对象
+ * @Param:
+ * @return:
+ * @Author: wangliang
+ * @Date: 2020/8/22
+ */
+@ApiModel("重考待审列表返回对象")
+public class ReexamListNotDoneBean extends ReexamListBean {
+
+}

themis-business/src/main/java/com/qmth/themis/business/constant/SystemConstant.java

@@ -41,7 +41,6 @@ public class SystemConstant {
     public static final String EXPORT_NO_DATA = "{'noData':'没有数据'}";
     public static final String IMPORT_INIT = "准备开始处理导入数据";
     public static final String EXPORT_INIT = "准备开始处理导出数据";
-    public static final String RECORDS = "records";
     public static final String RECORD_ID = "recordId";
     public static final String MESSAGE = "message";
     public static final String BREACH_STATUS = "breachStatus";
@@ -50,7 +49,6 @@ public class SystemConstant {
     public static final String SESSION = "session:";
     public static final String ORG = "org:cache:";
     public static final String LINK = "LINK";
-    public static final String MENU = "MENU";
     public static final String ALL_PATH = "/**";
     public static final String ACCOUNT = "account";
     public static final String STUDENT_ACCOUNT = "student";

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

@@ -2,7 +2,8 @@ package com.qmth.themis.business.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.qmth.themis.business.bean.backend.ReexamListNotDongBean;
+import com.qmth.themis.business.bean.backend.ReexamListDoneBean;
+import com.qmth.themis.business.bean.backend.ReexamListNotDoneBean;
 import com.qmth.themis.business.bean.backend.ReexamListRequestBean;
 import com.qmth.themis.business.entity.TEExamReexam;
 import org.apache.ibatis.annotations.Mapper;
@@ -58,7 +59,7 @@ public interface TEExamReexamMapper extends BaseMapper<TEExamReexam> {
      * @param userId
      * @return
      */
-    public IPage<ReexamListNotDongBean> reexamPageNotDoneList(IPage<Map> iPage, @Param("examId") Long examId,
+    public IPage<ReexamListNotDoneBean> reexamPageNotDoneList(IPage<Map> iPage, @Param("examId") Long examId,
                                                               @Param("examActivityId") Long examActivityId,
                                                               @Param("roomCode") String roomCode,
                                                               @Param("courseCode") String courseCode,
@@ -69,4 +70,33 @@ public interface TEExamReexamMapper extends BaseMapper<TEExamReexam> {
                                                               @Param("reasonEndTime") String reasonEndTime,
                                                               @Param("applyName") String applyName,
                                                               @Param("userId") Long userId);
+
+    /**
+     * 重考已审列表
+     *
+     * @param iPage
+     * @param examId
+     * @param examActivityId
+     * @param roomCode
+     * @param courseCode
+     * @param name
+     * @param identity
+     * @param auditingStatus
+     * @param reasonStartTime
+     * @param reasonEndTime
+     * @param applyName
+     * @param userId
+     * @return
+     */
+    public IPage<ReexamListDoneBean> reexamPageDoneList(IPage<Map> iPage, @Param("examId") Long examId,
+                                                        @Param("examActivityId") Long examActivityId,
+                                                        @Param("roomCode") String roomCode,
+                                                        @Param("courseCode") String courseCode,
+                                                        @Param("name") String name,
+                                                        @Param("identity") String identity,
+                                                        @Param("auditingStatus") Integer auditingStatus,
+                                                        @Param("reasonStartTime") String reasonStartTime,
+                                                        @Param("reasonEndTime") String reasonEndTime,
+                                                        @Param("applyName") String applyName,
+                                                        @Param("userId") Long userId);
 }

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

@@ -1,14 +1,8 @@
 package com.qmth.themis.business.service;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.qmth.themis.business.bean.backend.ReexamListNotDongBean;
-import com.qmth.themis.business.bean.backend.ReexamListRequestBean;
-import com.qmth.themis.business.entity.TEExamReexam;
 import com.qmth.themis.business.entity.TEExamReexamAuditing;
 
-import java.util.Map;
-
 /**
  * @Description: 考生重考审核人 服务类
  * @Param:

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

@@ -2,7 +2,8 @@ package com.qmth.themis.business.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.qmth.themis.business.bean.backend.ReexamListNotDongBean;
+import com.qmth.themis.business.bean.backend.ReexamListDoneBean;
+import com.qmth.themis.business.bean.backend.ReexamListNotDoneBean;
 import com.qmth.themis.business.bean.backend.ReexamListRequestBean;
 import com.qmth.themis.business.entity.TEExamReexam;
 
@@ -55,15 +56,44 @@ public interface TEExamReexamService extends IService<TEExamReexam> {
      * @param userId
      * @return
      */
-    public IPage<ReexamListNotDongBean> reexamPageNotDoneList(IPage<Map> iPage, Long examId,
-                                                                   Long examActivityId,
-                                                                   String roomCode,
-                                                                   String courseCode,
-                                                                   String name,
-                                                                   String identity,
-                                                                   String reason,
-                                                                   String reasonStartTime,
-                                                                   String reasonEndTime,
-                                                                   String applyName,
-                                                                   Long userId);
+    public IPage<ReexamListNotDoneBean> reexamPageNotDoneList(IPage<Map> iPage, Long examId,
+                                                              Long examActivityId,
+                                                              String roomCode,
+                                                              String courseCode,
+                                                              String name,
+                                                              String identity,
+                                                              String reason,
+                                                              String reasonStartTime,
+                                                              String reasonEndTime,
+                                                              String applyName,
+                                                              Long userId);
+
+    /**
+     * 重考已审列表
+     *
+     * @param iPage
+     * @param examId
+     * @param examActivityId
+     * @param roomCode
+     * @param courseCode
+     * @param name
+     * @param identity
+     * @param auditingStatus
+     * @param reasonStartTime
+     * @param reasonEndTime
+     * @param applyName
+     * @param userId
+     * @return
+     */
+    public IPage<ReexamListDoneBean> reexamPageDoneList(IPage<Map> iPage, Long examId,
+                                                        Long examActivityId,
+                                                        String roomCode,
+                                                        String courseCode,
+                                                        String name,
+                                                        String identity,
+                                                        Integer auditingStatus,
+                                                        String reasonStartTime,
+                                                        String reasonEndTime,
+                                                        String applyName,
+                                                        Long userId);
 }

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

@@ -2,7 +2,8 @@ package com.qmth.themis.business.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qmth.themis.business.bean.backend.ReexamListNotDongBean;
+import com.qmth.themis.business.bean.backend.ReexamListDoneBean;
+import com.qmth.themis.business.bean.backend.ReexamListNotDoneBean;
 import com.qmth.themis.business.bean.backend.ReexamListRequestBean;
 import com.qmth.themis.business.dao.TEExamReexamMapper;
 import com.qmth.themis.business.entity.TEExamReexam;
@@ -61,7 +62,29 @@ public class TEExamReexamServiceImpl extends ServiceImpl<TEExamReexamMapper, TEE
      * @return
      */
     @Override
-    public IPage<ReexamListNotDongBean> reexamPageNotDoneList(IPage<Map> iPage, Long examId, Long examActivityId, String roomCode, String courseCode, String name, String identity, String reason, String reasonStartTime, String reasonEndTime, String applyName, Long userId) {
+    public IPage<ReexamListNotDoneBean> reexamPageNotDoneList(IPage<Map> iPage, Long examId, Long examActivityId, String roomCode, String courseCode, String name, String identity, String reason, String reasonStartTime, String reasonEndTime, String applyName, Long userId) {
         return teExamReexamMapper.reexamPageNotDoneList(iPage, examId, examActivityId, roomCode, courseCode, name, identity, reason, reasonStartTime, reasonEndTime, applyName, userId);
     }
+
+    /**
+     * 重考已审列表
+     *
+     * @param iPage
+     * @param examId
+     * @param examActivityId
+     * @param roomCode
+     * @param courseCode
+     * @param name
+     * @param identity
+     * @param auditingStatus
+     * @param reasonStartTime
+     * @param reasonEndTime
+     * @param applyName
+     * @param userId
+     * @return
+     */
+    @Override
+    public IPage<ReexamListDoneBean> reexamPageDoneList(IPage<Map> iPage, Long examId, Long examActivityId, String roomCode, String courseCode, String name, String identity, Integer auditingStatus, String reasonStartTime, String reasonEndTime, String applyName, Long userId) {
+        return teExamReexamMapper.reexamPageDoneList(iPage, examId, examActivityId, roomCode, courseCode, name, identity, auditingStatus, reasonStartTime, reasonEndTime, applyName, userId);
+    }
 }

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

@@ -47,7 +47,7 @@
             order by tees.room_code
     </select>
 
-    <select id="reexamPageNotDoneList" resultType="com.qmth.themis.business.bean.backend.ReexamListNotDongBean">
+    <select id="reexamPageNotDoneList" resultType="com.qmth.themis.business.bean.backend.ReexamListNotDoneBean">
         select
             teer.id as reexamId,
             teer.exam_id as examId,
@@ -116,4 +116,8 @@
          </where>
          order by tees.room_code
     </select>
+
+    <select id="reexamPageDoneList" resultType="com.qmth.themis.business.bean.backend.ReexamListDoneBean">
+
+    </select>
 </mapper>