|
|
@@ -403,11 +403,18 @@ public List<Task> getTodayTasks(Long memberId, String dimensionCode) {
|
|
|
calendar.add(Calendar.DAY_OF_MONTH, 1);
|
|
|
Date endOfDay = calendar.getTime();
|
|
|
|
|
|
+ // 对齐 getTodayTasks 口径:包含 in_progress 状态 + isDailyProgress 任务
|
|
|
List<Task> all = taskMapper.selectList(new LambdaQueryWrapper<Task>()
|
|
|
.eq(Task::getFamilyId, familyId)
|
|
|
- .ge(Task::getDeadline, startOfDay)
|
|
|
- .lt(Task::getDeadline, endOfDay)
|
|
|
- .in(Task::getStatus, Arrays.asList("pending", "completed", "locked", "pending_review"))
|
|
|
+ .in(Task::getStatus, Arrays.asList("pending", "completed", "locked", "pending_review", "in_progress"))
|
|
|
+ .and(w -> w
|
|
|
+ .and(w2 -> w2.isNotNull(Task::getDeadline)
|
|
|
+ .ge(Task::getDeadline, startOfDay)
|
|
|
+ .lt(Task::getDeadline, endOfDay))
|
|
|
+ .or(w3 -> w3.eq(Task::getIsDailyProgress, 1)
|
|
|
+ .ge(Task::getCreatedAt, startOfDay)
|
|
|
+ .lt(Task::getCreatedAt, endOfDay)))
|
|
|
+ )
|
|
|
.orderByAsc(Task::getDeadline)
|
|
|
.orderByAsc(Task::getId));
|
|
|
return filterLockedChildren(all);
|