考情监考-大屏报表时间趋势修改

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

@@ -45,5 +45,6 @@ public interface TBExamInvigilateUserMapper extends CustomBaseMapper<TBExamInvig
      */
     public List<RoomCodeExportDto> examInvigilateUserExport(@Param("examId") Long examId, @Param("roomCode") String roomCode, @Param("userId") Long userId, @Param("orgId") Long orgId);
 
+    @SuppressWarnings("MybatisXMapperMethodInspection")
     public List<Map<String, String>> getInvigilateUsers(@Param("examId") Long examId, @Param("roomCode") String roomCode);
 }

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

@@ -95,8 +95,9 @@ public interface TEExamActivityMapper extends BaseMapper<TEExamActivity> {
     public TEExamActivityDto getWaitingExamByExamActivityId(@Param("examActivityId") Long examActivityId);
 
     public List<TEExamActivity> findByExamIdAndOrgId(@Param("examId") Long examId, @Param("orgId") Long orgId);
-    
+
+    @SuppressWarnings("MybatisXMapperMethodInspection")
     public List<Map<String,Long>> findMinStartTimeAndMaxFinshTimeByExamId(@Param("examId") Long examId);
-    
+
     public List<Long> findExamIdToday(@Param("startTime") Long startTime,@Param("endTime") Long endTime);
 }

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

@@ -47,6 +47,7 @@ public interface TEExamMapper extends BaseMapper<TEExam> {
      * @param code
      * @return
      */
+    @SuppressWarnings("MybatisXMapperMethodInspection")
     public List<Map> examroomQuery(@Param("code") String code);
 
     /**
@@ -66,6 +67,7 @@ public interface TEExamMapper extends BaseMapper<TEExam> {
      * @param orgId
      * @return
      */
+    @SuppressWarnings("MybatisXMapperMethodInspection")
     public List<Map> examList(@Param("userId") Long userId, @Param("orgId") Long orgId);
 
     /**

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

@@ -46,14 +46,17 @@ public interface TEExamStudentMapper extends CustomBaseMapper<TEExamStudent> {
                                                     @Param("roomCode") String roomCode, @Param("courseCode") String courseCode, @Param("grade") String grade,
                                                     @Param("enable") Integer enable, @Param("classNo") String classNo, @Param("hasPhoto") Integer hasPhoto);
 
+    @SuppressWarnings("MybatisXMapperMethodInspection")
     public List<Map<String, Object>> getTotalCount(@Param("orgId") Long orgId, @Param("examId") Long examId, @Param("activityId") Long activityId,
                                                    @Param("roomCode") String roomCode, @Param("courseCode") String courseCode);
 
     public IPage<ExamViewCountListBean> getTotalCountInfo(IPage<Map> iPage, @Param("orgId") Long orgId, @Param("examId") Long examId, @Param("activityId") Long activityId,
                                                           @Param("roomCode") String roomCode, @Param("courseCode") String courseCode);
 
+    @SuppressWarnings("MybatisXMapperMethodInspection")
     public List<Map<String, Object>> getDoneCountByActivityIds(@Param("examId") Long examId, @Param("activityIds") List<Long> activityIds);
 
+    @SuppressWarnings("MybatisXMapperMethodInspection")
     public List<Map<String, Object>> getAbsentCountByActivityIds(@Param("examId") Long examId, @Param("activityIds") List<Long> activityIds);
 
     /**

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

@@ -310,6 +310,7 @@ public interface TOeExamRecordMapper extends BaseMapper<TOeExamRecord> {
                                                                            Long userId,
                                                                            Long orgId);
 
+    @SuppressWarnings("MybatisXMapperMethodInspection")
     public List<Map<String, Object>> getDoneCountByDay(@Param("orgId") Long orgId, @Param("examId") Long examId, @Param("activityId") Long activityId,
                                                        @Param("roomCode") String roomCode, @Param("courseCode") String courseCode);
 
@@ -480,6 +481,7 @@ public interface TOeExamRecordMapper extends BaseMapper<TOeExamRecord> {
      * @param currentDate
      * @return
      */
+    @SuppressWarnings("MybatisXMapperMethodInspection")
     public Map<String, String> getTimeScale(@Param("timeSize") List<Integer> timeSize, @Param("currentDate") String currentDate);
 
     /**

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

@@ -28,6 +28,7 @@ public interface TOeFaceVerifyHistoryMapper extends BaseMapper<TOeFaceVerifyHist
      * @param batchNo
      * @return
      */
+    @SuppressWarnings("MybatisXMapperMethodInspection")
     public Map<String, Object> faceCountError(@Param("recordId") Long recordId, @Param("exception") String exception, @Param("faceCount") Integer faceCount, @Param("multipleFace") Boolean multipleFace, @Param("type") String type, @Param("batchNo") String batchNo);
 
     /**
@@ -39,6 +40,7 @@ public interface TOeFaceVerifyHistoryMapper extends BaseMapper<TOeFaceVerifyHist
      * @param batchNo
      * @return
      */
+    @SuppressWarnings("MybatisXMapperMethodInspection")
     public Map<String, Object> faceCompareError(@Param("recordId") Long recordId, @Param("exception") String exception, @Param("type") String type, @Param("batchNo") String batchNo);
 
     /**
@@ -50,6 +52,7 @@ public interface TOeFaceVerifyHistoryMapper extends BaseMapper<TOeFaceVerifyHist
      * @param batchNo
      * @return
      */
+    @SuppressWarnings("MybatisXMapperMethodInspection")
     public Map<String, Object> eyeCloseError(@Param("recordId") Long recordId, @Param("exception") String exception, @Param("type") String type, @Param("batchNo") String batchNo);
 
     /**
@@ -61,5 +64,6 @@ public interface TOeFaceVerifyHistoryMapper extends BaseMapper<TOeFaceVerifyHist
      * @param batchNo
      * @return
      */
+    @SuppressWarnings("MybatisXMapperMethodInspection")
     public Map<String, Object> realnessError(@Param("recordId") Long recordId, @Param("exception") String exception, @Param("type") String type, @Param("batchNo") String batchNo);
 }

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

@@ -424,11 +424,13 @@ public class TIeReportServiceImpl implements TIeReportService {
                         beforeT = timeScaleDataResultList.get(i - 1);
                         beforeOnlineCount = beforeT.getOnlineCount();
                     }
-                    t.setOnlineCount(onlineMap.get(t.getHour()).getOnlineCount() + beforeOnlineCount - onlineMap.get(t.getHour()).getOfflineCount());
+                    int onlineCount = onlineMap.get(t.getHour()).getOnlineCount() + beforeOnlineCount - onlineMap.get(t.getHour()).getOfflineCount();
+                    onlineCount = onlineCount < 0 ? 0 : onlineCount;
+                    t.setOnlineCount(onlineCount);
                 } else {
                     if (i > 0) {
                         beforeT = timeScaleDataResultList.get(i - 1);
-                        t.setOnlineCount(beforeT.getOnlineCount());
+                        t.setOnlineCount(beforeT.getOnlineCount() < 0 ? 0 : beforeT.getOnlineCount());
                     }
                 }
             }