课时补充调整

src/main/java/com/xjrsoft/module/classtime/service/impl/ClassTimeStatisticsServiceImpl.java

@@ -545,6 +545,13 @@ public class ClassTimeStatisticsServiceImpl extends MPJBaseServiceImpl<ClassTime
             //计算出一共有多少周
             ClassTimeStatistics statistics = this.getById(id);
             List<WeekTimeRangeVo> weekTimeRangeVos = calculateNaturalWeeks(statistics.getStartDate(), statistics.getEndDate());
+
+            List<DictionaryDetail> CourseTimeTypeList = dictionaryService.list(
+                    new QueryWrapper<DictionaryDetail>().lambda()
+                            .eq(DictionaryDetail::getItemId, 1833772737004875778L)
+                            .eq(DictionaryDetail::getDeleteMark, DeleteMark.NODELETE.getCode())
+            );
+
             /**
              * 2、将查询出来的数据按照表头转换成二维数组
              * 前端固定表头：序号、工号、姓名、教研会、督导听课、临近三年退休政策、出题、阅卷、周末培优、早自习、正课(含调顶课时）、晚辅(含调顶课时）、顶课、调课
@@ -561,12 +568,13 @@ public class ClassTimeStatisticsServiceImpl extends MPJBaseServiceImpl<ClassTime
                 rowData.add(sortCode.toString());//序号
                 rowData.add(recordVo.getUserName());//工号
                 rowData.add(recordVo.getName());//姓名
-                rowData.add(recordVo.getClassTime1()==null?"":recordVo.getClassTime1().toString());//教研会
-                rowData.add(recordVo.getClassTime2()==null?"":recordVo.getClassTime2().toString());//督导听课
-                rowData.add(recordVo.getClassTime3()==null?"":recordVo.getClassTime3().toString());//临近三年退休政策
-                rowData.add(recordVo.getClassTime4()==null?"":recordVo.getClassTime4().toString());//出题
-                rowData.add(recordVo.getClassTime5()==null?"":recordVo.getClassTime5().toString());//阅卷
-                rowData.add(recordVo.getClassTime6()==null?"":recordVo.getClassTime6().toString());//周末培优
+
+//                rowData.add(recordVo.getClassTime1()==null?"":recordVo.getClassTime1().toString());//教研会
+//                rowData.add(recordVo.getClassTime2()==null?"":recordVo.getClassTime2().toString());//督导听课
+//                rowData.add(recordVo.getClassTime3()==null?"":recordVo.getClassTime3().toString());//临近三年退休政策
+//                rowData.add(recordVo.getClassTime4()==null?"":recordVo.getClassTime4().toString());//出题
+//                rowData.add(recordVo.getClassTime5()==null?"":recordVo.getClassTime5().toString());//阅卷
+//                rowData.add(recordVo.getClassTime6()==null?"":recordVo.getClassTime6().toString());//周末培优
 
                 rowData.add(recordVo.getClassTime7()==null?"":recordVo.getClassTime7().toString());//早自习
                 rowData.add(recordVo.getClassTime8()==null?"":recordVo.getClassTime8().toString());//正课(含调顶课时）