From 685e8c6d6eb33d883f41f4d9470d9909ac074d16 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 10 七月 2025 11:09:28 +0800
Subject: [PATCH] 保洁巡检本周代码
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/TaskUtil.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 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 c2f0e0d..3d043de 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 {
@@ -285,7 +290,7 @@
task.setLocationId(tLocation.getId());
task.setImplementTime(LocalDateTime.now().plusDays(1));
task.setTaskType(1);
- task.setTemplateId(detail.getId());
+ task.setTemplateId(detail.getTemplateId());
String nameAndCode = CodeGenerateUtils.generateVolumeSn();
task.setTaskName(nameAndCode);
task.setTaskCode(nameAndCode);
@@ -294,7 +299,7 @@
// 添加应生成任务数量
TTemplateCount templateCount = new TTemplateCount();
- templateCount.setTemplateId(detail.getId());
+ templateCount.setTemplateId(detail.getTemplateId());
templateCount.setTaskCount(tLocationList.size()* cycle);
templateCount.setUserId(sysUser.getUserId());
templateCountService.save(templateCount);
--
Gitblit v1.7.1