From 627334e51e57100a3bd1da3ab4b7fd206a1fef32 Mon Sep 17 00:00:00 2001
From: aikai <ZZL86tdd>
Date: Thu, 13 Jun 2024 10:41:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=83=E5=8B=A4=E5=AE=9A=E6=97=B6=E5=A2=9E?=
 =?UTF-8?q?=E9=87=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../attendance/scheduling/AttendanceSchedulingMapper.java   | 2 +-
 .../yudao/module/system/job/attendance/SchedulingJob.java   | 6 +++---
 .../attendance/scheduling/AttendanceSchedulingService.java  | 2 +-
 .../scheduling/AttendanceSchedulingServiceImpl.java         | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/attendance/scheduling/AttendanceSchedulingMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/attendance/scheduling/AttendanceSchedulingMapper.java
index 3f34ab91..6f4f4fde 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/attendance/scheduling/AttendanceSchedulingMapper.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/attendance/scheduling/AttendanceSchedulingMapper.java
@@ -31,7 +31,7 @@ public interface AttendanceSchedulingMapper extends BaseMapperX<AttendanceSchedu
     }
 
     @MapKey("id")
-    Map<Long, Integer> countGroupId();
+    Map<Long, Map<String, Object>> countGroupId();
 
     /**
      * 获取使用的考勤组ids
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/job/attendance/SchedulingJob.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/job/attendance/SchedulingJob.java
index 2b40cad1..4dd0d7d2 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/job/attendance/SchedulingJob.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/job/attendance/SchedulingJob.java
@@ -27,15 +27,15 @@ public class SchedulingJob {
     @TenantJob // --- ⚠️ 这个注解 会将租户列表拉出来 完了后逐个租户执行 定时任务需要注意
     public ReturnT<String> execute() throws Exception {
         // -- 获取每个排班考勤组 有多少数量(也就是周期多少日)
-        Map<Long, Integer> map = attendanceSchedulingService.countGroupId();
+        Map<Long, Map<String, Object>> map = attendanceSchedulingService.countGroupId();
         if (MapUtil.isEmpty(map)) {
             return ReturnT.SUCCESS;
         }
-        for (Map.Entry<Long, Integer> entry : map.entrySet()) {
+        for (Map.Entry<Long, Map<String, Object>> entry : map.entrySet()) {
             String schedulingKey = Constants.SCHEDULING + Constants.UNDERLINE + entry.getKey();
             String value = stringRedisTemplate.opsForValue().get(schedulingKey);
             // -- 如果大于等于周期数 则重置为1
-            if (StrUtil.isNotEmpty(value) && Integer.parseInt(value) >= entry.getValue()) {
+            if (StrUtil.isNotEmpty(value) && Integer.parseInt(value) >= Integer.parseInt(entry.getValue().get("num").toString())) {
                 stringRedisTemplate.opsForValue().set(schedulingKey, "1");
             } else {
                 stringRedisTemplate.opsForValue().increment(schedulingKey);
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/attendance/scheduling/AttendanceSchedulingService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/attendance/scheduling/AttendanceSchedulingService.java
index 6cbf5213..b599065f 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/attendance/scheduling/AttendanceSchedulingService.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/attendance/scheduling/AttendanceSchedulingService.java
@@ -76,7 +76,7 @@ public interface AttendanceSchedulingService {
      *
      * @return
      */
-    Map<Long, Integer> countGroupId();
+    Map<Long, Map<String, Object>> countGroupId();
 
     /**
      * 获取考勤组和班次id的map
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/attendance/scheduling/AttendanceSchedulingServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/attendance/scheduling/AttendanceSchedulingServiceImpl.java
index b08143ea..2d2200b2 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/attendance/scheduling/AttendanceSchedulingServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/attendance/scheduling/AttendanceSchedulingServiceImpl.java
@@ -158,7 +158,7 @@ public class AttendanceSchedulingServiceImpl implements AttendanceSchedulingServ
     }
 
     @Override
-    public Map<Long, Integer> countGroupId() {
+    public Map<Long, Map<String, Object>> countGroupId() {
         return schedulingMapper.countGroupId();
     }