课表导出

src/main/java/com/xjrsoft/module/courseTable/service/impl/CourseTableServiceImpl.java

@@ -1104,9 +1104,15 @@ public class CourseTableServiceImpl extends ServiceImpl<CourseTableMapper, Cours
                 row.setHeightInPoints(48);
             }
             //合并
-            sheet.addMergedRegion(new CellRangeAddress(2, 5, 0, 0));
-            sheet.addMergedRegion(new CellRangeAddress(6, 8, 0, 0));
-            sheet.addMergedRegion(new CellRangeAddress(9, 11, 0, 0));
+            Map<Integer, List<Integer>> collect = data.getClassTimeList().stream()
+                    .collect(Collectors.groupingBy(ClassTime::getTimePeriod, Collectors.mapping(ClassTime::getNumber, Collectors.toList())));
+            int firstRow = 2;
+            for (Integer i : collect.keySet()) {
+                int lastRow = firstRow + collect.get(i).size() - 1;
+                sheet.addMergedRegion(new CellRangeAddress(firstRow, lastRow, 0, 0));
+
+                firstRow = firstRow + collect.get(i).size();
+            }
 
             ByteArrayOutputStream bot = new ByteArrayOutputStream();
             workbook.write(bot);