课时统计导出调整

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

@@ -234,6 +234,7 @@ public class ClassTimeStatisticsServiceImpl extends MPJBaseServiceImpl<ClassTime
                 for (String courseTimeType : CourseTimeTypeMap.keySet()) {
                     List<WfTeacherCourseTime> courseTimes = courseTimeMap.get(courseTimeType);
                     if(courseTimes == null){
+                        courseTimeTypeJson.addProperty(CourseTimeTypeMap.get(courseTimeType), 0);
                         continue;
                     }
                     double sum = courseTimes.stream()
@@ -561,7 +562,7 @@ public class ClassTimeStatisticsServiceImpl extends MPJBaseServiceImpl<ClassTime
              * 后端固定表头：总课时、课时费(元)、外聘教师超课时费(元)、总金额(元)
              */
             //计算一共多少列
-            int column = 13 + CourseTimeTypeList.size() + (4 * weekTimeRangeVos.size());
+            int column = 12 + CourseTimeTypeList.size() + (4 * weekTimeRangeVos.size());
             List<ArrayList<String>> dataList = new ArrayList<>();
             Integer sortCode = 1;
             JsonParser parser = new JsonParser();
@@ -651,7 +652,7 @@ public class ClassTimeStatisticsServiceImpl extends MPJBaseServiceImpl<ClassTime
             createSecondTitle(workbook, sheet, statistics, weekTimeRangeVos.size() * 4 + 1, CourseTimeTypeList);
 
             //第三行表头
-            createThirdTitle(workbook, sheet, statistics.getMonth(), weekTimeRangeVos, 2 + CourseTimeTypeList.size());
+            createThirdTitle(workbook, sheet, statistics.getMonth(), weekTimeRangeVos, 7 + CourseTimeTypeList.size());
             //第四行表头
             createFourthTitle(workbook, sheet, weekTimeRangeVos, 7 + CourseTimeTypeList.size());
             int dataRowNumber = 4;
@@ -758,7 +759,7 @@ public class ClassTimeStatisticsServiceImpl extends MPJBaseServiceImpl<ClassTime
         row1cell15.setCellStyle(cellStyle);
         cellNumber ++;
 
-        int index = cellNumber + mergeCoulmn;
+        int index = cellNumber + mergeCoulmn - 1;
         Cell row1cell16 = row1.createCell(index);
         row1cell16.setCellValue("总课时");
         row1cell16.setCellStyle(cellStyle);
@@ -775,12 +776,12 @@ public class ClassTimeStatisticsServiceImpl extends MPJBaseServiceImpl<ClassTime
         row1cell19.setCellValue("总金额(元)");
         row1cell19.setCellStyle(cellStyle);
         //合并表头
-        for(int i = 0; i < 14; i ++){
+        for(int i = 0; i < 8 + CourseTimeTypeList.size(); i ++){
             sheet.addMergedRegion(new CellRangeAddress(1, 3, i, i));
         }
 
         //合并中间动态表头
-        sheet.addMergedRegion(new CellRangeAddress(1, 1, 14, index - 1));
+        sheet.addMergedRegion(new CellRangeAddress(1, 1, 8 + CourseTimeTypeList.size(), index - 1));
         //合并前端表头
         for(int i = index; i <  index + 4; i ++){
             sheet.addMergedRegion(new CellRangeAddress(1, 3, i, i));