监考端接口

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

@@ -106,8 +106,8 @@ public class TEExamActivityController {
     @ApiOperation(value = "考试场次查询接口")
     @RequestMapping(value = "/query", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "考试场次信息", response = TEExamActivity.class)})
-    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);
+    public Result query(@ApiParam(value = "主键", required = false) @RequestParam(required = false) Long id,@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), id,examId, code, startDate, finishDate);
         BasePage basePage = new BasePage(teExamActivityIPage.getRecords(), teExamActivityIPage.getCurrent(), teExamActivityIPage.getSize(), teExamActivityIPage.getTotal());
         return ResultUtil.ok(basePage);
     }

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

@@ -65,13 +65,14 @@ public interface TEExamActivityMapper extends BaseMapper<TEExamActivity> {
      * 查询考场场次信息
      *
      * @param iPage
+     * @param id
      * @param examId
      * @param code
      * @param startDate
      * @param finishDate
      * @return
      */
-    public IPage<TEExamActivityQueryDto> examActivityQuery(IPage<Map> iPage, @Param("examId") Long examId, @Param("code") String code, @Param("startDate") String startDate, @Param("finishDate") String finishDate);
+    public IPage<TEExamActivityQueryDto> examActivityQuery(IPage<Map> iPage, @Param("id") Long id, @Param("examId") Long examId, @Param("code") String code, @Param("startDate") String startDate, @Param("finishDate") String finishDate);
 
     /**
      * 获取考试待考列表

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

@@ -63,13 +63,14 @@ public interface TEExamActivityService extends IService<TEExamActivity> {
      * 查询考场场次信息
      *
      * @param iPage
+     * @param id
      * @param examId
      * @param code
      * @param startDate
      * @param finishDate
      * @return
      */
-    public IPage<TEExamActivityQueryDto> examActivityQuery(IPage<Map> iPage, Long examId, String code, String startDate, String finishDate);
+    public IPage<TEExamActivityQueryDto> examActivityQuery(IPage<Map> iPage, Long id,Long examId, String code, String startDate, String finishDate);
 
     /**
      * 获取考试待考列表

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

@@ -96,8 +96,8 @@ public class TEExamActivityServiceImpl extends ServiceImpl<TEExamActivityMapper,
      * @return
      */
     @Override
-    public IPage<TEExamActivityQueryDto> examActivityQuery(IPage<Map> iPage, Long examId, String code, String startDate, String finishDate) {
-        return teExamActivityMapper.examActivityQuery(iPage, examId, code, startDate, finishDate);
+    public IPage<TEExamActivityQueryDto> examActivityQuery(IPage<Map> iPage, Long id,Long examId, String code, String startDate, String finishDate) {
+        return teExamActivityMapper.examActivityQuery(iPage,id, examId, code, startDate, finishDate);
     }
 
     /**