课表导出

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

@@ -1109,6 +1109,9 @@ public class CourseTableServiceImpl extends ServiceImpl<CourseTableMapper, Cours
             int firstRow = 2;
             for (Integer i : collect.keySet()) {
                 int lastRow = firstRow + collect.get(i).size() - 1;
+                if(lastRow == firstRow){
+                    continue;
+                }
                 sheet.addMergedRegion(new CellRangeAddress(firstRow, lastRow, 0, 0));
 
                 firstRow = firstRow + collect.get(i).size();

src/main/java/com/xjrsoft/module/schedule/controller/ScheduleController.java

@@ -324,12 +324,12 @@ public class ScheduleController {
         return jsonParser.parse(result).getAsJsonObject();
     }
 
-    @PostMapping("/schedule-week-export-query")
-    @ApiOperation(value = "按周导出课表")
-    public ResponseEntity<byte[]> scheduleWeekExportQuery(@Valid @RequestBody CourseTableDto dto) {
-//    @GetMapping("/schedule-week-export-query")
+//    @PostMapping("/schedule-week-export-query")
 //    @ApiOperation(value = "按周导出课表")
-//    public ResponseEntity<byte[]> textbookClaimExportQuery(ScheduleWeekExportQueryDto dto) {
+//    public ResponseEntity<byte[]> scheduleWeekExportQuery(@Valid @RequestBody CourseTableDto dto) {
+    @GetMapping("/schedule-week-export-query")
+    @ApiOperation(value = "按周导出课表")
+    public ResponseEntity<byte[]> textbookClaimExportQuery(ScheduleWeekExportQueryDto dto) {
 
         ByteArrayOutputStream bot = courseTableService.scheduleWeekExportQuery(dto);
         return RT.fileStream(bot.toByteArray(), "scheduleWeek" + ExcelTypeEnum.XLSX.getValue());