|
|
@@ -561,7 +561,7 @@ public class ClassTimeStatisticsServiceImpl extends MPJBaseServiceImpl<ClassTime
|
|
|
* 后端固定表头:总课时、课时费(元)、外聘教师超课时费(元)、总金额(元)
|
|
|
*/
|
|
|
//计算一共多少列
|
|
|
- int column = 19 + (4 * weekTimeRangeVos.size());
|
|
|
+ int column = 13 + CourseTimeTypeList.size() + (4 * weekTimeRangeVos.size());
|
|
|
List<ArrayList<String>> dataList = new ArrayList<>();
|
|
|
Integer sortCode = 1;
|
|
|
JsonParser parser = new JsonParser();
|
|
|
@@ -653,7 +653,7 @@ public class ClassTimeStatisticsServiceImpl extends MPJBaseServiceImpl<ClassTime
|
|
|
//第三行表头
|
|
|
createThirdTitle(workbook, sheet, statistics.getMonth(), weekTimeRangeVos, 7 + CourseTimeTypeList.size());
|
|
|
//第四行表头
|
|
|
- createFourthTitle(workbook, sheet, weekTimeRangeVos, 13);
|
|
|
+ createFourthTitle(workbook, sheet, weekTimeRangeVos, 7 + CourseTimeTypeList.size());
|
|
|
int dataRowNumber = 4;
|
|
|
//设置样式
|
|
|
font = workbook.createFont();
|