Merge remote-tracking branch 'origin/dev_1.0.0' into dev_1.0.0

src/main/java/com/qmth/exam/reserve/bean/applytask/TaskNoticeReq.java

@@ -0,0 +1,21 @@
+package com.qmth.exam.reserve.bean.applytask;
+
+import com.qmth.exam.reserve.bean.IModel;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class TaskNoticeReq implements IModel {
+
+    private static final long serialVersionUID = -814809589827661745L;
+
+    @ApiModelProperty("任务ID")
+    private Long id;
+
+    @ApiModelProperty("考试说明")
+    private String notice;
+
+}

src/main/java/com/qmth/exam/reserve/bean/applytask/TaskTimeReq.java

@@ -0,0 +1,21 @@
+package com.qmth.exam.reserve.bean.applytask;
+
+import com.qmth.exam.reserve.bean.IModel;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class TaskTimeReq implements IModel {
+
+    private static final long serialVersionUID = -4231952659347248347L;
+
+    @ApiModelProperty("任务ID")
+    private Long id;
+
+    @ApiModelProperty("时段json")
+    private String timeJson;
+
+}

src/main/java/com/qmth/exam/reserve/controller/admin/ApplyTaskController.java

@@ -13,6 +13,8 @@ import com.qmth.boot.api.annotation.Aac;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.boot.core.collection.PageResult;
 import com.qmth.boot.core.exception.StatusException;
+import com.qmth.exam.reserve.bean.applytask.TaskNoticeReq;
+import com.qmth.exam.reserve.bean.applytask.TaskTimeReq;
 import com.qmth.exam.reserve.bean.applytask.TimePeriodReq;
 import com.qmth.exam.reserve.bean.login.LoginUser;
 import com.qmth.exam.reserve.bean.task.ApplyTaskPageReq;
@@ -60,20 +62,19 @@ public class ApplyTaskController extends BaseController {
 
     @ApiOperation(value = "预约时段新增/编辑")
     @PostMapping(value = "/time/save")
-    public void timeSave(@ApiParam("预约任务ID") @RequestParam Long id,
-            @ApiParam("预约时段json") @RequestBody String timeJson) {
-        List<TimePeriodReq> timeList = JsonHelper.toList(timeJson, TimePeriodReq.class);
+    public void timeSave(@ApiParam("预约时段") @RequestBody TaskTimeReq req) {
+        List<TimePeriodReq> timeList = JsonHelper.toList(req.getTimeJson(), TimePeriodReq.class);
         if (timeList.isEmpty())
             throw new StatusException("请填写时段");
         LoginUser user = this.curLoginUser();
-        timePeriodService.saveTimePeriod(user.getId(), id, timeList);
+        timePeriodService.saveTimePeriod(user.getId(), req.getId(), timeList);
     }
 
     @ApiOperation(value = "考试说明新增/编辑")
     @PostMapping(value = "/notice/save")
-    public void noticesave(@ApiParam("预约任务ID") @RequestParam Long id, @ApiParam("考试说明") @RequestBody String notice) {
+    public void noticesave(@ApiParam("预约说明") @RequestBody TaskNoticeReq req) {
         LoginUser user = this.curLoginUser();
-        applyTaskService.saveNotice(user.getId(), id, notice);
+        applyTaskService.saveNotice(user.getId(), req.getId(), req.getNotice());
     }
 
     @ApiOperation(value = "预约任务启用/禁用")