Merge branch 'dev_v1.1.3' into release_v1.1.3

merge

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

@@ -102,7 +102,7 @@ public class TEExamStudentController {
                                         @ApiParam(value = "考试场次id", required = false) @RequestParam(required = false) Long activityId,
                                         @ApiParam(value = "科目编码", required = false) @RequestParam(required = false) String courseCode,
                                         @ApiParam(value = "考场编码", required = false) @RequestParam(required = false) String roomCode,
-                                        @ApiParam(value = "交卷方式", required = false) @RequestParam(required = false) FinishTypeEnum finishType,
+                                        @ApiParam(value = "交卷方式", required = false) @RequestParam(required = false) String finishType,
                                         @ApiParam(value = "姓名", required = false) @RequestParam(required = false) String name,
                                         @ApiParam(value = "证件号", required = false) @RequestParam(required = false) String identity,
                                         @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) int pageNumber,

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

@@ -525,7 +525,7 @@ public interface TOeExamRecordService extends IService<TOeExamRecord> {
                                                              Long examActivityId,
                                                              String courseCode,
                                                              String roomCode,
-                                                             FinishTypeEnum finishType,
+                                                             String finishType,
                                                              String name,
                                                              String identity);
 

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

@@ -1411,8 +1411,8 @@ public class TOeExamRecordServiceImpl extends ServiceImpl<TOeExamRecordMapper, T
      * @return
      */
     @Override
-    public IPage<ExamRecordDetailBean> examRecordDetailQuery(IPage<Map> iPage, Long examId, Long examActivityId, String courseCode, String roomCode, FinishTypeEnum finishType, String name, String identity) {
-        return tOeExamRecordMapper.examRecordDetailQuery(iPage, examId, examActivityId, courseCode, roomCode, Objects.nonNull(finishType) ? finishType.name() : null, name, identity);
+    public IPage<ExamRecordDetailBean> examRecordDetailQuery(IPage<Map> iPage, Long examId, Long examActivityId, String courseCode, String roomCode, String finishType, String name, String identity) {
+        return tOeExamRecordMapper.examRecordDetailQuery(iPage, examId, examActivityId, courseCode, roomCode, finishType, name, identity);
     }
 
     /**

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

@@ -1669,7 +1669,14 @@
                 and tees.room_code = #{roomCode}
             </if>
             <if test="finishType != null and finishType != ''">
-                and toer.finish_type = #{finishType}
+                <choose>
+                    <when test="finishType == 'ALL'">
+                        and (toer.finish_type = 'MANUAL' or toer.finish_type = 'AUTO' or toer.finish_type = 'BREACH' or toer.finish_type = 'INTERRUPT')
+                    </when>
+                    <otherwise>
+                        and toer.finish_type = #{finishType}
+                    </otherwise>
+                </choose>
             </if>
             <if test="name != null and name !=''">
                 and tees.name like CONCAT('%', #{name},'%')