|
@@ -581,22 +581,22 @@ public class UserPlanServiceImpl extends ServiceImpl<UserPlanMapper, UserPlan> i
|
|
|
break;
|
|
break;
|
|
|
case 3:
|
|
case 3:
|
|
|
dayStudyVos=dayStudyVos.stream()
|
|
dayStudyVos=dayStudyVos.stream()
|
|
|
- .filter(v -> v.getDate() < 4 + cal.get(Calendar.DAY_OF_MONTH) && v.getDate() > cal.get(Calendar.DAY_OF_MONTH) - 3)
|
|
|
|
|
|
|
+ .filter(v -> v.getDate() < 4 + cal.get(Calendar.DAY_OF_MONTH) && v.getDate() >= cal.get(Calendar.DAY_OF_MONTH) - 3)
|
|
|
.collect(Collectors.toList());
|
|
.collect(Collectors.toList());
|
|
|
break;
|
|
break;
|
|
|
case 4:
|
|
case 4:
|
|
|
dayStudyVos=dayStudyVos.stream()
|
|
dayStudyVos=dayStudyVos.stream()
|
|
|
- .filter(v -> v.getDate() < 3 + cal.get(Calendar.DAY_OF_MONTH) && v.getDate() > cal.get(Calendar.DAY_OF_MONTH) - 4)
|
|
|
|
|
|
|
+ .filter(v -> v.getDate() < 3 + cal.get(Calendar.DAY_OF_MONTH) && v.getDate() >= cal.get(Calendar.DAY_OF_MONTH) - 4)
|
|
|
.collect(Collectors.toList());
|
|
.collect(Collectors.toList());
|
|
|
break;
|
|
break;
|
|
|
case 5:
|
|
case 5:
|
|
|
dayStudyVos=dayStudyVos.stream()
|
|
dayStudyVos=dayStudyVos.stream()
|
|
|
- .filter(v -> v.getDate() < 2 + cal.get(Calendar.DAY_OF_MONTH) && v.getDate() > cal.get(Calendar.DAY_OF_MONTH) - 5)
|
|
|
|
|
|
|
+ .filter(v -> v.getDate() < 2 + cal.get(Calendar.DAY_OF_MONTH) && v.getDate() >= cal.get(Calendar.DAY_OF_MONTH) - 5)
|
|
|
.collect(Collectors.toList());
|
|
.collect(Collectors.toList());
|
|
|
break;
|
|
break;
|
|
|
case 6:
|
|
case 6:
|
|
|
dayStudyVos=dayStudyVos.stream()
|
|
dayStudyVos=dayStudyVos.stream()
|
|
|
- .filter(v -> v.getDate() < 1 + cal.get(Calendar.DAY_OF_MONTH) && v.getDate() > cal.get(Calendar.DAY_OF_MONTH) - 6)
|
|
|
|
|
|
|
+ .filter(v -> v.getDate() < 1 + cal.get(Calendar.DAY_OF_MONTH) && v.getDate() >= cal.get(Calendar.DAY_OF_MONTH) - 6)
|
|
|
.collect(Collectors.toList());
|
|
.collect(Collectors.toList());
|
|
|
break;
|
|
break;
|
|
|
}
|
|
}
|