|
@@ -204,9 +204,10 @@ public class PunchInManagerImpl implements IPunchInManager {
|
|
|
|
|
|
|
|
// 当前日期
|
|
// 当前日期
|
|
|
LocalDate today = LocalDate.now();
|
|
LocalDate today = LocalDate.now();
|
|
|
- String todayStr = DateUtils.YYYY_MM_DD_FORMATTER.format(today);
|
|
|
|
|
- // 获取一周的起始日期范围
|
|
|
|
|
- List<LocalDate> weeklyDateRange = DateUtils.getDateRangeInWeek();
|
|
|
|
|
|
|
+ LocalDate beforeToady = today.minusDays(5);
|
|
|
|
|
+ LocalDate afterToady = today.plusDays(4);
|
|
|
|
|
+ // 获取日期范围
|
|
|
|
|
+ List<LocalDate> weeklyDateRange = DateUtils.getDateRange(beforeToady, afterToady);
|
|
|
|
|
|
|
|
// 打卡任务唯一ID
|
|
// 打卡任务唯一ID
|
|
|
Set<Long> taskUniqueIds = piTasks.stream().map(PiTask::getUniqueId).collect(Collectors.toSet());
|
|
Set<Long> taskUniqueIds = piTasks.stream().map(PiTask::getUniqueId).collect(Collectors.toSet());
|