From c785652a9fc4524ad1801adf0f7b44dd0892f2c4 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 08 七月 2025 11:54:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/TaskUtil.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/TaskUtil.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/TaskUtil.java
index 0cb80f4..d679c65 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/TaskUtil.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/TaskUtil.java
@@ -189,6 +189,10 @@
}
int dayCleanerCount = cleanerSums / cycle;
+ if((cycle - detail.getCurrentValue()) == 1 && cleanerSums % cycle != 0){
+ dayCleanerCount++;
+ }
+
// 获取保洁员权重
List<String> cleanerIds = redisCache.getCacheList(detail.getId() + CLEANER_WEIGHT);
// 获取保洁员列表
@@ -217,7 +221,8 @@
redisCache.deleteObject(detail.getId() + CLEANER_WEIGHT);
List<TCleaner> tCleaners1 = randomSelection(cleaners1, dayCleanerCount - tCleaners.size());
List<String> cleanIds1 = tCleaners1.stream().map(TCleaner::getId).collect(Collectors.toList());
- // 将已抽取的项目部id保存到redis中
+ // 将已抽取的保洁员id保存到redis中
+ cleanIds1.addAll(cleanIds);
redisCache.setCacheList(detail.getId() + CLEANER_WEIGHT, cleanIds1);
tCleaners.addAll(tCleaners1);
}else {
--
Gitblit v1.7.1