|
|
@@ -254,13 +254,10 @@ public class UserPlanServiceImpl extends ServiceImpl<UserPlanMapper, UserPlan> i
|
|
|
List<CoursePlanVo> coursePlanVo = baseMapper.selectByListCourse(bo);
|
|
|
|
|
|
//获得当天的学习课程节数
|
|
|
- List<CalendarStudyVo> collect = calendarStudyVos.stream()
|
|
|
- .filter(c -> c.getMonth()==cal.get(Calendar.MONTH) + 1)
|
|
|
- .collect(Collectors.toList());
|
|
|
coursePlanVo.stream().forEach(s -> {
|
|
|
- collect.stream().forEach(c -> {
|
|
|
+ calendarStudyVos.stream().filter(c -> c.getMonth()==cal.get(Calendar.MONTH) + 1).forEach(c -> {
|
|
|
c.getDayStudyList().stream()
|
|
|
- .filter(g -> g.getDate() == cal.get(Calendar.DAY_OF_MONTH)+1)
|
|
|
+ .filter(g -> g.getDate() == cal.get(Calendar.DAY_OF_MONTH))
|
|
|
.forEach(d -> {
|
|
|
if (d.getStudyCourseKnob() != null && d.getStudyCourseKnob() != 0){
|
|
|
Map<Long, Long> courseDayMap = d.getCourseDayMap();
|