From 9364cf6824389a3264dc2cdb2bc3b5857ce76ad5 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 03 七月 2025 23:38:54 +0800
Subject: [PATCH] bug修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/task/TaskUtil.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 62b0083..c2f0e0d 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
@@ -171,10 +171,10 @@
List<String> proIds = projectDepts.stream().map(TProjectDept::getId).collect(Collectors.toList());
// 拿到抽取的项目部下的所有保洁员
- List<TProjectDept> tProjectDeptList = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class)
- .in(TProjectDept::getId, proIds));
+// List<TProjectDept> tProjectDeptList = projectDeptService.list(Wrappers.lambdaQuery(TProjectDept.class)
+// .in(TProjectDept::getId, proIds));
// 获取片区id
- List<String> areaIds = tProjectDeptList.stream().map(TProjectDept::getId).collect(Collectors.toList());
+ List<String> areaIds = projectDepts.stream().map(TProjectDept::getId).collect(Collectors.toList());
if(CollectionUtils.isEmpty(areaIds)){
return;
}
@@ -184,7 +184,7 @@
.in(TCleaner::getProjectId, areaIds));
int cleanerSums = num1 * Integer.parseInt(count + "");
// 获取每天需要抽取的保洁员数,向上取整
- if (cleanerSums <cycle){
+ if (cleanerSums < cycle){
cleanerSums = cycle;
}
int dayCleanerCount = cleanerSums / cycle;
@@ -297,7 +297,7 @@
templateCount.setTemplateId(detail.getId());
templateCount.setTaskCount(tLocationList.size()* cycle);
templateCount.setUserId(sysUser.getUserId());
- templateCountService.saveOrUpdate(templateCount);
+ templateCountService.save(templateCount);
taskCleanService.saveBatch(tasks);
template.setTaskCount(tasks.size());
--
Gitblit v1.7.1