Bladeren bron

课时统计导出调整

dzx 1 jaar geleden
bovenliggende
commit
6a90cd906c

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

@@ -248,7 +248,7 @@ public class ClassTimeStatisticsServiceImpl extends MPJBaseServiceImpl<ClassTime
                                 .filter(x -> x.getTeacherIds().contains(teacher.getId().toString()) && localDate.equals(x.getScheduleDate()))
                                 .mapToDouble(WfTeacherCourseTime::getCourseTime).sum();
                         JsonObject courseJson = new JsonObject();
-                        courseJson.addProperty("type", courseTimeType);
+                        courseJson.addProperty("type", CourseTimeTypeMap.get(courseTimeType));
                         courseJson.addProperty("scheduleDate", localDate.format(formatter));
                         courseJson.addProperty("content", sum1);
                         courseJson.addProperty("adjustType", "");
@@ -651,7 +651,7 @@ public class ClassTimeStatisticsServiceImpl extends MPJBaseServiceImpl<ClassTime
             createSecondTitle(workbook, sheet, statistics, weekTimeRangeVos.size() * 4 + 1, CourseTimeTypeList);
 
             //第三行表头
-            createThirdTitle(workbook, sheet, statistics.getMonth(), weekTimeRangeVos, 7 + CourseTimeTypeList.size());
+            createThirdTitle(workbook, sheet, statistics.getMonth(), weekTimeRangeVos, 2 + CourseTimeTypeList.size());
             //第四行表头
             createFourthTitle(workbook, sheet, weekTimeRangeVos, 7 + CourseTimeTypeList.size());
             int dataRowNumber = 4;