Browse Source

课时量统计调整

dzx 12 hours ago
parent
commit
6f94653c6d

+ 6 - 0
src/main/java/com/xjrsoft/module/classtime/service/impl/ClassTimeStatisticsServiceImpl.java

@@ -837,6 +837,12 @@ public class ClassTimeStatisticsServiceImpl extends MPJBaseServiceImpl<ClassTime
 
                 //循环,统计出各项数据
                 for (CourseListVo courseListVo : courseList) {
+                    Map<LocalDate, String> deleteDates = deleteMap.get(courseListVo.getClassId());
+                    if(deleteDates != null && deleteDates.containsKey(courseListVo.getScheduleDate()) && deleteDates.get(courseListVo.getScheduleDate()) != null
+                            && deleteDates.get(courseListVo.getScheduleDate()).contains(courseListVo.getTimeNumber()) ){
+                        continue;
+                    }
+
                     if("早自习".equals(courseListVo.getShortName())){
                         classTime8 += weightLabelMap.get(courseListVo.getShortName()) == null ? 0d : weightLabelMap.get(courseListVo.getShortName());
                     }else if(zkList.contains(courseListVo.getShortName())){