教师综合评价排名

src/main/java/com/template/controller/SmartEvaluateTeacherController.java

@@ -665,7 +665,7 @@ public class SmartEvaluateTeacherController implements SmartEvaluateTeacherContr
             ScoreRankVo data = new ScoreRankVo();
             data = srv.get(i);
             long existCount = result.stream().filter(e -> e.getUserId().intValue() == set.getUserId().intValue()).count();
-            if(existCount <= 0 && i == 3){
+            if(existCount <= 0 && i ==4){
 
                 data = new ScoreRankVo();
                 Optional<ScoreRankVo> oSrv = srv.stream().filter(e -> e.getUserId().intValue() == set.getUserId().intValue()).findFirst();

src/main/java/com/template/controller/SmartUserController.java

@@ -4987,17 +4987,21 @@ public class SmartUserController implements SmartUserControllerAPI {
         return CommonResult.ok(map);
     }
 
+    /**
+     * 在校统计 逻辑说明：
+     * 监听包含请假、门禁、打卡、人脸
+     */
     @Override
     @DESRespondSecret(validated = true)
     public CommonResult statisticsCampusManage(Integer gradeId, Integer classId, String dateTime, Integer type, String keyWord) {
         DateTimeFormatter dateTimeFormatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         LocalDateTime startTime = LocalDateTime.parse(dateTime, dateTimeFormatter1);
         LocalDateTime endTime = startTime.plusDays(1);
-        //        正常
+        //正常
         Set<StatisticsCampusManageVo> vos = new HashSet<>();
 
-//            请假
-        //        查找请假记录
+        //请假
+        //查找请假记录
         List<StatisticsCampusManageVo> ackVos = smartUserService.getAckStatisticsCampusManage(gradeId, classId, startTime, endTime, keyWord);
         if (ObjectUtils.isNotEmpty(ackVos) && ackVos.size() > 0) {
             for (StatisticsCampusManageVo ackVo : ackVos) {
@@ -5005,28 +5009,28 @@ public class SmartUserController implements SmartUserControllerAPI {
             }
         }
 
-//        查找门禁记录
+        //查找门禁记录
         List<StatisticsCampusManageVo> accessVos = smartUserService.getAccessStatisticsCampusManage(gradeId, classId, startTime, endTime, keyWord);
         for (StatisticsCampusManageVo accessVo : accessVos) {
             vos.add(accessVo);
         }
-//        查找打卡记录
+        //查找打卡记录
         List<StatisticsCampusManageVo> attendanceVos = smartUserService.getAttendanceStatisticsCampusManage(gradeId, classId, startTime, endTime, keyWord);
         for (StatisticsCampusManageVo attendanceVo : attendanceVos) {
             vos.add(attendanceVo);
         }
-//        查找人脸记录
+        //查找人脸记录
         List<StatisticsCampusManageVo> faceDiscernVos = smartUserService.getFaceDiscernStatisticsCampusManage(gradeId, classId, startTime, endTime, keyWord);
         for (StatisticsCampusManageVo faceDiscernVo : faceDiscernVos) {
             vos.add(faceDiscernVo);
         }
 
 
-//            异常
-        //        查找该班级下的所有人
+        //异常
+        //查找该班级下的所有人
         List<StatisticsCampusManageVo> campusVos = smartUserService.getClassStudentManage(gradeId, classId, keyWord);
 
-//        不在正常记录里面的就是异常记录
+        //不在正常记录里面的就是异常记录
         ArrayList<StatisticsCampusManageVo> abnormalVos = new ArrayList<>();
         for (StatisticsCampusManageVo campusVo : campusVos) {
             if (!vos.contains(campusVo)) {
@@ -5035,9 +5039,9 @@ public class SmartUserController implements SmartUserControllerAPI {
         }
 
         JSONObject jsonObject = new JSONObject();
-        jsonObject.put("abnormal",abnormalVos.size());
-        jsonObject.put("normal",vos.size());
-        jsonObject.put("ack",ackVos.size());
+        jsonObject.put("abnormal",abnormalVos.size());//未监听
+        jsonObject.put("normal",vos.size());//监听
+        jsonObject.put("ack",ackVos.size());//请假
 
         if (1==type) {
             jsonObject.put("data",abnormalVos);