wuheng 1 year ago
parent
commit
d356f94b23

+ 0 - 3
controller/src/main/java/com/koobietech/eas/controller/EasEduClassController.java

@@ -128,9 +128,6 @@ public class EasEduClassController {
 
     /**
      * 通过条件查询班级类
-     * @param easEduClass
-     * @param pageNum
-     * @param pageSize
      * @return
      */
     @PostMapping(value = "/submitGroupStudentForm/{groupId}")

+ 4 - 6
controller/src/main/java/com/koobietech/eas/controller/EasEduScheduleController.java

@@ -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")

+ 4 - 7
service/src/main/java/com/koobietech/eas/service/impl/EasEduScheduleServiceImpl.java

@@ -42,19 +42,16 @@ public class EasEduScheduleServiceImpl implements EasEduScheduleService {
 
         schedule.setCreateTime(new Date());
         schedule.setModifyTime(new Date());
-
+        if ( Objects.isNull(repeatTime) || repeatTime < 1 ) {
+            repeatTime = 1;
+        }
         for (int re = 0; re < repeatTime; re++) {
-            if (re != 0) {
+            if ( re != 0 ) {
                 startCalender.add(Calendar.DATE, 1);
                 endCalender.add(Calendar.DATE, 1);
             }
             schedule.setStartTime(startCalender.getTime());
             schedule.setEndTime(endCalender.getTime());
-            if ((schedule.getWeek() + 1) != 7) {
-                schedule.setWeek((schedule.getWeek() + 1) % 7);
-            } else {
-                schedule.setWeek(7);
-            }
             if (easEduScheduleMapper.insert(schedule) == 0) {
                 return false;
             }