fix: 统一数据分析查询条件,排除草稿和已删除任务

This commit is contained in:
Your Name 2026-01-16 21:04:16 +08:00
parent 8f1bfec562
commit aabcc77ddb

View File

@ -83,7 +83,9 @@ public class AnalyticsService {
// 构建查询条件(所有用户查看所有数据,可通过参数过滤)
LambdaQueryWrapper<Task> queryWrapper = new LambdaQueryWrapper<Task>()
.ge(startTime != null, Task::getCreateTime, startTime)
.le(Task::getCreateTime, endTime);
.le(Task::getCreateTime, endTime)
.ne(Task::getStatus, "draft") // 排除草稿状态的任务
.eq(Task::getDeleted, 0); // 排除已删除的任务
// 如果指定了部门ID,则按部门过滤
if (deptId != null) {
@ -1874,7 +1876,8 @@ public class AnalyticsService {
LambdaQueryWrapper<Task> queryWrapper = new LambdaQueryWrapper<Task>()
.ge(startTime != null, Task::getCreateTime, startTime)
.le(Task::getCreateTime, endTime)
.ne(Task::getStatus, "draft"); // 排除草稿
.ne(Task::getStatus, "draft") // 排除草稿
.eq(Task::getDeleted, 0); // 排除已删除的任务
List<Task> tasks = taskMapper.selectList(queryWrapper);
log.info("查询到任务数量: {}", tasks.size());