LIVE_YE 1 gadu atpakaļ
vecāks
revīzija
db3590ae5d

+ 14 - 13
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/common/AppletServiceImpl.java

@@ -202,24 +202,25 @@ public class AppletServiceImpl implements IAppletService {
         }
 
         for (SysDeptVo sysDept : fSysDeptList) {
+            //设置昨日延迟放学数量 = TODAY_YAN_CHI + formalTeacherClass.getSchoolId() + ":" + DateUtils.getDate()
+            Object num = RedisUtils.getCacheObject(TODAY_YAN_CHI + sysDept.getDeptId() + ":" + DateUtils.getDateByDays(-1));
+            long count = pSysDeptList.stream().filter(s -> s.getParentId().equals(sysDept.getDeptId())).count();
+            if (ObjectUtils.isEmpty(num)) {
+                //设置昨日延迟放学数量 = 0
+                RedisUtils.setCacheObject(LAST_DAY_YAN_CHI + sysDept.getDeptId() + ":" + DateUtils.getDateByDays(-1), 0);
+                //设置昨日准时放学数量 =该学校下所有班级的数量
+                RedisUtils.setCacheObject(LAST_DAY_ZHUN_SHI + sysDept.getDeptId() + ":" + DateUtils.getDateByDays(-1),count );
+            } else {
+                RedisUtils.setCacheObject(LAST_DAY_YAN_CHI + sysDept.getDeptId() + ":" + DateUtils.getDateByDays(-1), num);
+                RedisUtils.setCacheObject(LAST_DAY_ZHUN_SHI + sysDept.getDeptId() + ":" + DateUtils.getDateByDays(-1), count - (int) num);
+            }
+            //设置今日延迟放学数量
+            RedisUtils.setCacheObject(TODAY_YAN_CHI + sysDept.getDeptId() + ":" + DateUtils.getDate(), 0);
             for (SysDeptVo dept : pSysDeptList) {
                 if (sysDept.getDeptId().equals(dept.getParentId())) {
                     String key = DateUtils.getDate() + ":" + sysDept.getDeptId() + ":" + dept.getDeptId();
                     String value = dept.getDeptName() + ":time";
                     RedisUtils.setCacheObject(key, value);
-                    //设置昨日延迟放学数量 = TODAY_YAN_CHI + formalTeacherClass.getSchoolId() + ":" + DateUtils.getDate()
-                    Object num = RedisUtils.getCacheObject(TODAY_YAN_CHI + sysDept.getDeptId() + ":" + DateUtils.getDateByDays(-1));
-                    if (ObjectUtils.isEmpty(num)) {
-                        //设置昨日延迟放学数量 = 0
-                        RedisUtils.setCacheObject(LAST_DAY_YAN_CHI + sysDept.getDeptId() + ":" + DateUtils.getDateByDays(-1), 0);
-                        //设置昨日准时放学数量 = pSysDeptList.size() - 昨日延迟放学数量
-                        RedisUtils.setCacheObject(LAST_DAY_ZHUN_SHI + sysDept.getDeptId() + ":" + DateUtils.getDateByDays(-1), pSysDeptList.size());
-                    } else {
-                        RedisUtils.setCacheObject(LAST_DAY_YAN_CHI + sysDept.getDeptId() + ":" + DateUtils.getDateByDays(-1), num);
-                        RedisUtils.setCacheObject(LAST_DAY_ZHUN_SHI + sysDept.getDeptId() + ":" + DateUtils.getDateByDays(-1), pSysDeptList.size() - (int) num);
-                    }
-                    //设置今日延迟放学数量
-                    RedisUtils.setCacheObject(TODAY_YAN_CHI + sysDept.getDeptId() + ":" + DateUtils.getDate(), 0);
                 }
             }
         }