ソースを参照

格式化测试

haogh 1 年間 前
コミット
9051239ddb

+ 7 - 1
src/main/java/com/qmth/exam/reserve/bean/task/ApplyTaskVo.java → src/main/java/com/qmth/exam/reserve/bean/task/ApplyTaskVO.java

@@ -6,7 +6,7 @@ import lombok.Setter;
 
 @Getter
 @Setter
-public class ApplyTaskVo {
+public class ApplyTaskVO {
 
     @ApiModelProperty("id")
     private Long id;
@@ -31,4 +31,10 @@ public class ApplyTaskVo {
 
     @ApiModelProperty("更新时间")
     private Long updateTime;
+
+    @ApiModelProperty("考前多少天,禁止考生自主预约")
+    private Integer allowApplyDays;
+
+    @ApiModelProperty("考前多少天,禁止考生自主取消预约")
+    private Integer allowApplyCancelDays;
 }

+ 11 - 2
src/main/java/com/qmth/exam/reserve/controller/admin/ApplyTaskController.java

@@ -2,19 +2,22 @@ package com.qmth.exam.reserve.controller.admin;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.qmth.boot.api.annotation.Aac;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.boot.core.collection.PageResult;
 import com.qmth.exam.reserve.bean.task.ApplyTaskReq;
-import com.qmth.exam.reserve.bean.task.ApplyTaskVo;
+import com.qmth.exam.reserve.bean.task.ApplyTaskVO;
 import com.qmth.exam.reserve.controller.BaseController;
 import com.qmth.exam.reserve.service.ApplyTaskService;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 
 @RestController
 @Api(tags = "预约任务相关接口")
@@ -27,7 +30,13 @@ public class ApplyTaskController extends BaseController {
 
     @ApiOperation(value = "预约任务查询")
     @PostMapping(value = "/page")
-    public PageResult<ApplyTaskVo> page(ApplyTaskReq req) {
+    public PageResult<ApplyTaskVO> page(@RequestBody ApplyTaskReq req) {
 	return applyTaskService.page(req);
     }
+
+    @ApiOperation(value = "预约任务编辑查询")
+    @PostMapping(value = "/find")
+    public ApplyTaskVO find(@ApiParam("预约任务ID") @RequestParam Long id) {
+	return null;
+    }
 }

+ 2 - 2
src/main/java/com/qmth/exam/reserve/dao/ApplyTaskDao.java

@@ -6,10 +6,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qmth.exam.reserve.bean.task.ApplyTaskReq;
-import com.qmth.exam.reserve.bean.task.ApplyTaskVo;
+import com.qmth.exam.reserve.bean.task.ApplyTaskVO;
 import com.qmth.exam.reserve.entity.ApplyTaskEntity;
 
 public interface ApplyTaskDao extends BaseMapper<ApplyTaskEntity> {
 
-    IPage<ApplyTaskVo> page(Page<ApplyTaskVo> page, @Param(value = "req") ApplyTaskReq req);
+    IPage<ApplyTaskVO> page(Page<ApplyTaskVO> page, @Param(value = "req") ApplyTaskReq req);
 }

+ 2 - 2
src/main/java/com/qmth/exam/reserve/service/ApplyTaskService.java

@@ -3,11 +3,11 @@ package com.qmth.exam.reserve.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.qmth.boot.core.collection.PageResult;
 import com.qmth.exam.reserve.bean.task.ApplyTaskReq;
-import com.qmth.exam.reserve.bean.task.ApplyTaskVo;
+import com.qmth.exam.reserve.bean.task.ApplyTaskVO;
 import com.qmth.exam.reserve.entity.ApplyTaskEntity;
 
 public interface ApplyTaskService extends IService<ApplyTaskEntity> {
 
-    PageResult<ApplyTaskVo> page(ApplyTaskReq req);
+    PageResult<ApplyTaskVO> page(ApplyTaskReq req);
 
 }

+ 3 - 3
src/main/java/com/qmth/exam/reserve/service/impl/ApplyTaskServiceImpl.java

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.boot.core.collection.PageResult;
 import com.qmth.exam.reserve.bean.task.ApplyTaskReq;
-import com.qmth.exam.reserve.bean.task.ApplyTaskVo;
+import com.qmth.exam.reserve.bean.task.ApplyTaskVO;
 import com.qmth.exam.reserve.dao.ApplyTaskDao;
 import com.qmth.exam.reserve.entity.ApplyTaskEntity;
 import com.qmth.exam.reserve.service.ApplyTaskService;
@@ -17,8 +17,8 @@ import com.qmth.exam.reserve.util.PageUtil;
 public class ApplyTaskServiceImpl extends ServiceImpl<ApplyTaskDao, ApplyTaskEntity> implements ApplyTaskService {
 
     @Override
-    public PageResult<ApplyTaskVo> page(ApplyTaskReq req) {
-	IPage<ApplyTaskVo> iPage = this.baseMapper.page(new Page<ApplyTaskVo>(req.getPageNumber(), req.getPageSize()),
+    public PageResult<ApplyTaskVO> page(ApplyTaskReq req) {
+	IPage<ApplyTaskVO> iPage = this.baseMapper.page(new Page<ApplyTaskVO>(req.getPageNumber(), req.getPageSize()),
 		req);
 	return PageUtil.of(iPage);
     }

+ 4 - 4
src/main/resources/mapper/ApplyTaskMapper.xml

@@ -2,12 +2,12 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.qmth.exam.reserve.dao.ApplyTaskDao">
 	<select id="page"
-		resultType="com.qmth.exam.reserve.bean.task.ApplyTaskVo">
+		resultType="com.qmth.exam.reserve.bean.task.ApplyTaskVO">
 		select id,name,self_apply_start_time selfApplyStartTime,
 		self_apply_end_time selfApplyEndTime,
-		open_apply_start_time
-		openApplyStartTime,open_apply_end_time
-		openApplyEndTime,enable,update_time updateTime from t_apply_task t
+		open_apply_start_time openApplyStartTime,
+		open_apply_end_time openApplyEndTime,
+		enable,update_time updateTime from t_apply_task t
 		<if test="req.name != null and req.name!=''">
 			where t.name like concat('%', #{req.name}, '%')
 		</if>