Sfoglia il codice sorgente

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

wangliang 2 anni fa
parent
commit
21e3102354

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

@@ -123,7 +123,8 @@ public class TIeInvigilateCallMobileController {
     @RequestMapping(value = "/call/count", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "监考监控信息", response = Integer.class)})
     public Result callCount(@ApiParam(value = "考试批次id", required = true) @RequestParam Long examId,
-                            @ApiParam(value = "通话状态", required = false) @RequestParam(required = false) String callStatus) {
+                            @ApiParam(value = "通话状态", required = false) @RequestParam(required = false) String callStatus,
+                            @ApiParam(value = "虚拟考场代码", required = false) @RequestParam(required = false) String roomCode) {
         if (Objects.isNull(examId) || Objects.equals(examId, "")) {
             throw new BusinessException(ExceptionResultEnum.EXAM_ID_IS_NULL);
         }
@@ -140,7 +141,7 @@ public class TIeInvigilateCallMobileController {
         }
         int count = tIeExamInvigilateCallService
                 .examInvigilateCallQueryCount(examId, userId, tbUser.getOrgId(), MonitorStatusSourceEnum.START.name(),
-                        callStatus);
+                        callStatus, roomCode);
         return ResultUtil.ok(Collections.singletonMap("count", count));
     }
 

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

@@ -41,7 +41,8 @@ public interface TIeExamInvigilateCallMapper extends BaseMapper<TIeExamInvigilat
      * @param orgId
      * @param status
      * @param callStatus
+     * @param roomCode
      * @return
      */
-    public Integer examInvigilateCallQueryCount(@Param("examId") Long examId, @Param("userId") Long userId, @Param("orgId") Long orgId, @Param("status") String status, @Param("callStatus") String callStatus);
+    public Integer examInvigilateCallQueryCount(@Param("examId") Long examId, @Param("userId") Long userId, @Param("orgId") Long orgId, @Param("status") String status, @Param("callStatus") String callStatus, @Param("roomCode") String roomCode);
 }

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

@@ -38,7 +38,8 @@ public interface TIeExamInvigilateCallService extends IService<TIeExamInvigilate
      * @param orgId
      * @param status
      * @param callStatus
+     * @param roomCode
      * @return
      */
-    public Integer examInvigilateCallQueryCount(Long examId, Long userId, Long orgId, String status, String callStatus);
+    public Integer examInvigilateCallQueryCount(Long examId, Long userId, Long orgId, String status, String callStatus, String roomCode);
 }

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

@@ -49,10 +49,11 @@ public class TIeExamInvigilateCallServiceImpl extends ServiceImpl<TIeExamInvigil
      * @param orgId
      * @param status
      * @param callStatus
+     * @param roomCode
      * @return
      */
     @Override
-    public Integer examInvigilateCallQueryCount(Long examId, Long userId, Long orgId, String status, String callStatus) {
-        return tIeExamInvigilateCallMapper.examInvigilateCallQueryCount(examId, userId, orgId, status, callStatus);
+    public Integer examInvigilateCallQueryCount(Long examId, Long userId, Long orgId, String status, String callStatus, String roomCode) {
+        return tIeExamInvigilateCallMapper.examInvigilateCallQueryCount(examId, userId, orgId, status, callStatus, roomCode);
     }
 }

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

@@ -74,6 +74,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')