|
@@ -1,6 +1,7 @@
|
|
|
package com.koobietech.eas.controller;
|
|
|
|
|
|
import com.github.pagehelper.PageHelper;
|
|
|
+import com.koobietech.eas.common.result.JsonPageResult;
|
|
|
import com.koobietech.eas.common.result.JsonResult;
|
|
|
import com.koobietech.eas.common.result.PageDataResult;
|
|
|
import com.koobietech.eas.dao.dto.ConflictDto;
|
|
@@ -53,14 +54,11 @@ public class EasEduScheduleController {
|
|
|
|
|
|
@PostMapping("/query")
|
|
|
@Operation(summary = "查询课程表", description = "根据参数查询课程表信息")
|
|
|
- public JsonResult query(@RequestBody(required = false) EasEduSchedule schedule,
|
|
|
- @RequestParam Long pageNum, @RequestParam Long pageSize) {
|
|
|
-
|
|
|
-
|
|
|
+ public JsonPageResult query(@RequestBody(required = false) EasEduSchedule schedule,
|
|
|
+ @RequestParam Long pageNum, @RequestParam Long pageSize) {
|
|
|
PageHelper.startPage(Math.toIntExact(pageNum), Math.toIntExact(pageSize));
|
|
|
PageDataResult ret = easEduScheduleService.query(schedule);
|
|
|
- System.out.println(ret.toString());
|
|
|
- return JsonResult.data(ret);
|
|
|
+ return JsonPageResult.data(ret);
|
|
|
}
|
|
|
|
|
|
@PutMapping("/queryConflict")
|