Sfoglia il codice sorgente

新增考试批次编码查询考场信息

wangliang 2 anni fa
parent
commit
2cecf98951

+ 2 - 1
themis-admin/src/main/java/com/qmth/themis/admin/api/TIeInvigilateCallMobileController.java

@@ -87,6 +87,7 @@ public class TIeInvigilateCallMobileController {
     @ApiResponses({@ApiResponse(code = 200, message = "监考监控信息", response = TIeExamInvigilateCallDto.class)})
     public Result callList(@ApiParam(value = "考试批次id", required = true) @RequestParam(required = true) Long examId,
                            @ApiParam(value = "通话状态", required = false) @RequestParam(required = false) String callStatus,
+                           @ApiParam(value = "虚拟考场代码", required = false) @RequestParam(required = false) String roomCode,
                            @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) int pageNumber,
                            @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) int pageSize) {
         if (Objects.isNull(examId) || Objects.equals(examId, "")) {
@@ -105,7 +106,7 @@ public class TIeInvigilateCallMobileController {
         }
         IPage<TIeExamInvigilateCallDto> tIeExamInvigilateCallIPage = tIeExamInvigilateCallService
                 .examInvigilateCallQuery(new Page<>(pageNumber, pageSize), examId, userId, tbUser.getOrgId(),
-                        MonitorStatusSourceEnum.START.name(), callStatus);
+                        MonitorStatusSourceEnum.START.name(), callStatus, roomCode);
         tIeExamInvigilateCallIPage.getRecords().forEach(s -> {
             s.setBasePhotoPath(
                     ossUtil.getAliYunOssPublicDomain().getPublicUrl() + File.separator + s.getBasePhotoPath());

+ 2 - 1
themis-business/src/main/java/com/qmth/themis/business/dao/TIeExamInvigilateCallMapper.java

@@ -28,9 +28,10 @@ public interface TIeExamInvigilateCallMapper extends BaseMapper<TIeExamInvigilat
      * @param orgId
      * @param status
      * @param callStatus
+     * @param roomCode
      * @return
      */
-    public IPage<TIeExamInvigilateCallDto> examInvigilateCallQuery(IPage<Map> iPage, @Param("examId") Long examId, @Param("userId") Long userId, @Param("orgId") Long orgId, @Param("status") String status, @Param("callStatus") String callStatus);
+    public IPage<TIeExamInvigilateCallDto> examInvigilateCallQuery(IPage<Map> iPage, @Param("examId") Long examId, @Param("userId") Long userId, @Param("orgId") Long orgId, @Param("status") String status, @Param("callStatus") String callStatus, @Param("roomCode") String roomCode);
 
     /**
      * 监考监控通话count查询

+ 2 - 1
themis-business/src/main/java/com/qmth/themis/business/service/TIeExamInvigilateCallService.java

@@ -25,9 +25,10 @@ public interface TIeExamInvigilateCallService extends IService<TIeExamInvigilate
      * @param orgId
      * @param status
      * @param callStatus
+     * @param roomCode
      * @return
      */
-    public IPage<TIeExamInvigilateCallDto> examInvigilateCallQuery(IPage<Map> iPage, Long examId, Long userId, Long orgId, String status, String callStatus);
+    public IPage<TIeExamInvigilateCallDto> examInvigilateCallQuery(IPage<Map> iPage, Long examId, Long userId, Long orgId, String status, String callStatus, String roomCode);
 
     /**
      * 监考监控通话count查询

+ 3 - 2
themis-business/src/main/java/com/qmth/themis/business/service/impl/TIeExamInvigilateCallServiceImpl.java

@@ -33,11 +33,12 @@ public class TIeExamInvigilateCallServiceImpl extends ServiceImpl<TIeExamInvigil
      * @param orgId
      * @param status
      * @param callStatus
+     * @param roomCode
      * @return
      */
     @Override
-    public IPage<TIeExamInvigilateCallDto> examInvigilateCallQuery(IPage<Map> iPage, Long examId, Long userId, Long orgId, String status, String callStatus) {
-        return tIeExamInvigilateCallMapper.examInvigilateCallQuery(iPage, examId, userId, orgId, status, callStatus);
+    public IPage<TIeExamInvigilateCallDto> examInvigilateCallQuery(IPage<Map> iPage, Long examId, Long userId, Long orgId, String status, String callStatus, String roomCode) {
+        return tIeExamInvigilateCallMapper.examInvigilateCallQuery(iPage, examId, userId, orgId, status, callStatus, roomCode);
     }
 
     /**

+ 3 - 0
themis-business/src/main/resources/mapper/TIeExamInvigilateCallMapper.xml

@@ -34,6 +34,9 @@
             <if test="callStatus != null and callStatus != ''">
                 and tieic.call_status = #{callStatus}
             </if>
+            <if test="roomCode != null and roomCode != ''">
+                and tees.room_code = #{roomCode}
+            </if>
         </where>
         <if test="callStatus != null and callStatus != '' and callStatus == 'START'">
             and (toer.status = 'FIRST_PREPARE' or toer.status = 'ANSWERING' or toer.status = 'BREAK_OFF' or toer.status = 'RESUME_PREPARE')