소스 검색

代码保持和IDEA格式化一致

haogh 1 년 전
부모
커밋
0b374bec2a

+ 12 - 12
src/main/java/com/qmth/exam/reserve/bean/PagerReq.java

@@ -11,28 +11,28 @@ public class PagerReq {
     protected Integer pageSize;
 
     public Integer getPageNumber() {
-	// 默认值
-	if (pageNumber == null || pageNumber < 1) {
-	    pageNumber = 1;
-	}
+        // 默认值
+        if (pageNumber == null || pageNumber < 1) {
+            pageNumber = 1;
+        }
 
-	return pageNumber;
+        return pageNumber;
     }
 
     public Integer getPageSize() {
-	// 默认值
-	if (pageSize == null || pageSize < 1) {
-	    pageSize = 10;
-	}
+        // 默认值
+        if (pageSize == null || pageSize < 1) {
+            pageSize = 10;
+        }
 
-	return pageSize;
+        return pageSize;
     }
 
     public void setPageNumber(Integer pageNumber) {
-	this.pageNumber = pageNumber;
+        this.pageNumber = pageNumber;
     }
 
     public void setPageSize(Integer pageSize) {
-	this.pageSize = pageSize;
+        this.pageSize = pageSize;
     }
 }

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

@@ -31,12 +31,19 @@ public class ApplyTaskController extends BaseController {
     @ApiOperation(value = "预约任务查询")
     @PostMapping(value = "/page")
     public PageResult<ApplyTaskVO> page(@RequestBody ApplyTaskReq req) {
-	return applyTaskService.page(req);
+        return applyTaskService.page(req);
     }
 
     @ApiOperation(value = "预约任务编辑查询")
     @PostMapping(value = "/find")
     public ApplyTaskVO find(@ApiParam("预约任务ID") @RequestParam Long id) {
-	return null;
+        System.out.println("111");
+        return null;
+    }
+
+    @ApiOperation(value = "基础规则新增/编辑")
+    @PostMapping(value = "/save")
+    public void save() {
+        System.out.println("888");
     }
 }

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

@@ -18,9 +18,9 @@ public class ApplyTaskServiceImpl extends ServiceImpl<ApplyTaskDao, ApplyTaskEnt
 
     @Override
     public PageResult<ApplyTaskVO> page(ApplyTaskReq req) {
-	IPage<ApplyTaskVO> iPage = this.baseMapper.page(new Page<ApplyTaskVO>(req.getPageNumber(), req.getPageSize()),
-		req);
-	return PageUtil.of(iPage);
+        IPage<ApplyTaskVO> iPage = this.baseMapper.page(new Page<ApplyTaskVO>(req.getPageNumber(), req.getPageSize()),
+                req);
+        return PageUtil.of(iPage);
     }
 
 }

+ 14 - 14
src/main/java/com/qmth/exam/reserve/util/PageUtil.java

@@ -8,22 +8,22 @@ import com.qmth.boot.core.collection.PageResult;
 public class PageUtil {
 
     public static <T> PageResult<T> of(IPage<T> iPage) {
-	PageResult<T> result = new PageResult<>();
-	result.setResult(iPage.getRecords());
-	result.setPageNumber(iPage.getCurrent());
-	result.setPageSize(iPage.getSize());
-	result.setTotalCount(iPage.getTotal());
-	result.setPageCount(iPage.getPages());
-	return result;
+        PageResult<T> result = new PageResult<>();
+        result.setResult(iPage.getRecords());
+        result.setPageNumber(iPage.getCurrent());
+        result.setPageSize(iPage.getSize());
+        result.setTotalCount(iPage.getTotal());
+        result.setPageCount(iPage.getPages());
+        return result;
     }
 
     public static <T> PageResult<T> emptyPage() {
-	PageResult<T> page = new PageResult<>();
-	page.setPageCount(0);
-	page.setPageNumber(1);
-	page.setPageSize(10);
-	page.setTotalCount(0);
-	page.setResult(new ArrayList<>());
-	return page;
+        PageResult<T> page = new PageResult<>();
+        page.setPageCount(0);
+        page.setPageNumber(1);
+        page.setPageSize(10);
+        page.setTotalCount(0);
+        page.setResult(new ArrayList<>());
+        return page;
     }
 }

+ 2 - 1
src/main/resources/mapper/ApplyTaskMapper.xml

@@ -5,7 +5,8 @@
 		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_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!=''">