|
@@ -319,7 +319,7 @@ public class ClassTimeStatisticsServiceImpl extends MPJBaseServiceImpl<ClassTime
|
|
|
//如果这个课程数据包含在被删除的课时中,跳过不计算
|
|
|
Map<LocalDate, String> deleteDates = deleteMap.get(courseListVo.getClassId());
|
|
|
JsonObject courseJson = new JsonObject();
|
|
|
- if(deleteDates != null && deleteDates.containsKey(courseListVo.getScheduleDate())
|
|
|
+ if(deleteDates != null && deleteDates.containsKey(courseListVo.getScheduleDate()) && deleteDates.get(courseListVo.getScheduleDate()) != null
|
|
|
&& deleteDates.get(courseListVo.getScheduleDate()).contains(courseListVo.getTimeNumber()) ){
|
|
|
courseJson.addProperty("type", courseListVo.getShortName());
|
|
|
courseJson.addProperty("scheduleDate", courseListVo.getScheduleDate().format(formatter));
|
|
@@ -369,7 +369,8 @@ public class ClassTimeStatisticsServiceImpl extends MPJBaseServiceImpl<ClassTime
|
|
|
LocalDate scheduleDate = courseListVo.getScheduleDate();
|
|
|
//如果这个课程数据包含在被删除的课时中,跳过不计算
|
|
|
Map<LocalDate, String> deleteDates = deleteMap.get(courseListVo.getClassId());
|
|
|
- if(deleteDates != null && deleteDates.containsKey(scheduleDate) && deleteDates.get(courseListVo.getScheduleDate()).contains(courseListVo.getTimeNumber())){
|
|
|
+ if(deleteDates != null && deleteDates.containsKey(scheduleDate) && deleteDates.get(courseListVo.getScheduleDate()) != null
|
|
|
+ && deleteDates.get(courseListVo.getScheduleDate()).contains(courseListVo.getTimeNumber())){
|
|
|
continue;
|
|
|
}
|
|
|
|