监考日志修改

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

@@ -71,11 +71,11 @@ public class TEExamCourseController {
     @ApiOperation(value = "考试科目查询接口")
     @RequestMapping(value = "/course/query", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "考试科目信息", response = TEExamCourse.class)})
-    public Result query(@ApiParam(value = "考试批次id", required = true) @RequestParam Long examId, @ApiParam(value = "科目编码", required = false) @RequestParam(required = false) String courseCode, @ApiParam(value = "科目名称", required = false) @RequestParam(required = false) String courseName, @ApiParam(value = "是否已绑定试卷", required = false) @RequestParam(required = false) Integer hasPaper, @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber, @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
+    public Result query(@ApiParam(value = "id", required = false) @RequestParam(required = false) Long id, @ApiParam(value = "考试批次id", required = true) @RequestParam Long examId, @ApiParam(value = "科目编码", required = false) @RequestParam(required = false) String courseCode, @ApiParam(value = "科目名称", required = false) @RequestParam(required = false) String courseName, @ApiParam(value = "是否已绑定试卷", required = false) @RequestParam(required = false) Integer hasPaper, @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<TEExamCourseDto> examCourseIPage = teExamCourseService.examCourseQuery(new Page<>(pageNumber, pageSize), examId, courseCode, courseName, hasPaper);
+        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);

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

@@ -23,13 +23,14 @@ public interface TEExamCourseMapper extends BaseMapper<TEExamCourse> {
      * 查询考试科目
      *
      * @param iPage
+     * @param id
      * @param examId
      * @param courseCode
      * @param courseName
      * @param hasPaper
      * @return
      */
-    public IPage<TEExamCourseDto> examCourseQuery(IPage<Map> iPage, @Param("examId") Long examId, @Param("courseCode") String courseCode, @Param("courseName") String courseName, @Param("hasPaper") Integer hasPaper);
+    public IPage<TEExamCourseDto> examCourseQuery(IPage<Map> iPage, @Param("id") Long id, @Param("examId") Long examId, @Param("courseCode") String courseCode, @Param("courseName") String courseName, @Param("hasPaper") Integer hasPaper);
 
-    public TEExamCourse findByExamIdAndCourseCode(@Param("examId") Long examId,@Param("courseCode") String courseCode);
+    public TEExamCourse findByExamIdAndCourseCode(@Param("examId") Long examId, @Param("courseCode") String courseCode);
 }

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

@@ -21,13 +21,14 @@ public interface TEExamCourseService extends IService<TEExamCourse> {
      * 查询考试科目
      *
      * @param iPage
+     * @param id
      * @param examId
      * @param courseCode
      * @param courseName
      * @param hasPaper
      * @return
      */
-    public IPage<TEExamCourseDto> examCourseQuery(IPage<Map> iPage, Long examId, String courseCode, String courseName, Integer hasPaper);
+    public IPage<TEExamCourseDto> examCourseQuery(IPage<Map> iPage, Long id, Long examId, String courseCode, String courseName, Integer hasPaper);
 
 
     ExamCourseCacheBean getExamCourseCacheBean(Long examId, String courseCode);

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

@@ -42,6 +42,7 @@ public class TEExamCourseServiceImpl extends ServiceImpl<TEExamCourseMapper, TEE
      * 查询考试科目
      *
      * @param iPage
+     * @param id
      * @param examId
      * @param courseCode
      * @param courseName
@@ -49,9 +50,9 @@ public class TEExamCourseServiceImpl extends ServiceImpl<TEExamCourseMapper, TEE
      * @return
      */
     @Override
-    public IPage<TEExamCourseDto> examCourseQuery(IPage<Map> iPage, Long examId, String courseCode, String courseName,
+    public IPage<TEExamCourseDto> examCourseQuery(IPage<Map> iPage, Long id, Long examId, String courseCode, String courseName,
                                                   Integer hasPaper) {
-        return teExamCourseMapper.examCourseQuery(iPage, examId, courseCode, courseName, hasPaper);
+        return teExamCourseMapper.examCourseQuery(iPage, id, examId, courseCode, courseName, hasPaper);
     }
 
     @Override

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

@@ -41,6 +41,9 @@
 		t_e_exam_course teec
 		left join t_e_exam tee on teec.exam_id = tee.id
 		<where>
+			<if test="id != null and id != ''">
+				and teec.id = #{id}
+			</if>
 			<if test="examId != null and examId != ''">
 				and teec.exam_id = #{examId}
 			</if>