From a1bd915740533c7eec7ef64015b28ba6b815374a Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 28 一月 2026 17:46:26 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/smart_screen
---
ruoyi-system/src/main/java/com/ruoyi/system/service/ProjectCategoryCalculator.java | 8 ++++----
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ClientServiceImpl.java | 2 ++
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ProjectCategoryCalculator.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ProjectCategoryCalculator.java
index ae6fa8f..0a9d2b5 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ProjectCategoryCalculator.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ProjectCategoryCalculator.java
@@ -558,10 +558,10 @@
break;
}
}
-
- if (!matchesRule) {
- break;
- }
+ //短路与开关
+ // if (!matchesRule) {
+ // break;
+ // }
}
if (matchesRule) {
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ClientServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ClientServiceImpl.java
index ed7b47c..beb7d39 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ClientServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ClientServiceImpl.java
@@ -109,6 +109,8 @@
// 1. 先查询符合条件的 Task
LambdaQueryWrapper<Task> taskWrapper = new LambdaQueryWrapper<>();
taskWrapper.in(Task::getProjectId, projectIds)
+ .ge(Task::getDate, monthStart.toInstant().atZone(ZoneId.systemDefault()).toLocalDate())
+ .le(Task::getDate, monthEnd.toInstant().atZone(ZoneId.systemDefault()).toLocalDate())
.eq(Task::getDeleted, false);
List<Task> tasks = taskMapper.selectList(taskWrapper);
--
Gitblit v1.7.1