分页

mec-web/src/main/java/com/ym/mec/web/controller/school/CoursePatrolEvaluationController.java

@@ -1,17 +1,16 @@
 package com.ym.mec.web.controller.school;
 
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.update.Update;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.microsvc.toolkit.common.response.paging.PageInfo;
+
 import com.microsvc.toolkit.common.response.paging.QueryInfo;
 import com.microsvc.toolkit.config.validator.group.ValidGroups;
-import com.ym.mec.biz.dal.entity.CoursePatrolEvaluation;
 import com.ym.mec.biz.dal.wrapper.CoursePatrolEvaluationWrapper;
 import com.ym.mec.biz.service.CoursePatrolEvaluationService;
 import com.ym.mec.biz.service.OrganizationService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
+import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.page.PageUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -43,14 +42,14 @@ public class CoursePatrolEvaluationController extends BaseController {
 
     @ApiOperation(value = "学校端-查询巡堂统计分页", notes = "巡堂详情- 传入 CoursePatrolEvaluationWrapper.CoursePatrolEvaluationQuery")
     @PostMapping("/pageStat")
-    public HttpResponseResult<PageInfo<CoursePatrolEvaluationWrapper.CoursePatrolEvaluationStat>> pageStat(@RequestBody CoursePatrolEvaluationWrapper.CoursePatrolEvaluationQuery query,@RequestHeader Integer coopId) {
+    public HttpResponseResult<PageInfo<CoursePatrolEvaluationWrapper.CoursePatrolEvaluationStat>> pageStat(@RequestBody CoursePatrolEvaluationWrapper.CoursePatrolEvaluationQuery query, @RequestHeader Integer coopId) {
         if (coopId == null) {
             return succeed();
         }
         query.setCooperationOrganId(coopId);
 
         IPage<CoursePatrolEvaluationWrapper.CoursePatrolEvaluationStat> page = coursePatrolEvaluationService.pageStat(QueryInfo.getPage(query), query);
-        return succeed(QueryInfo.pageInfo(page));
+        return succeed(PageUtil.pageInfo(page));
     }
 
 
@@ -62,7 +61,7 @@ public class CoursePatrolEvaluationController extends BaseController {
         query.setPatrolFlag(true);
         IPage<CoursePatrolEvaluationWrapper.CoursePatrolEvaluationInfo> pages = coursePatrolEvaluationService.selectPage(QueryInfo.getPage(query), query);
 
-        return succeed(QueryInfo.pageInfo(pages));
+        return succeed(PageUtil.pageInfo(pages));
     }
 
     @ApiOperation(value = "学校端-查询巡堂分页", notes = "巡堂详情- 传入 CoursePatrolEvaluationWrapper.CoursePatrolEvaluationQuery")
@@ -74,7 +73,7 @@ public class CoursePatrolEvaluationController extends BaseController {
         query.setCooperationOrganId(coopId);
         IPage<CoursePatrolEvaluationWrapper.CoursePatrolEvaluationInfo> pages = coursePatrolEvaluationService.selectPage(QueryInfo.getPage(query), query);
         
-        return succeed(QueryInfo.pageInfo(pages));
+        return succeed(PageUtil.pageInfo(pages));
 	}
     
     @ApiOperation(value = "学校端-添加巡堂信息", notes = "巡堂详情- 传入 CoursePatrolEvaluationWrapper.CoursePatrolEvaluation")

mec-web/src/main/java/com/ym/mec/web/controller/school/SchoolActivityController.java

@@ -1,16 +1,15 @@
 package com.ym.mec.web.controller.school;
 
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.update.Update;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.microsvc.toolkit.common.response.paging.PageInfo;
 import com.microsvc.toolkit.common.response.paging.QueryInfo;
 import com.microsvc.toolkit.config.validator.group.ValidGroups;
-import com.ym.mec.biz.dal.entity.SchoolActivity;
 import com.ym.mec.biz.dal.wrapper.SchoolActivityWrapper;
 import com.ym.mec.biz.service.SchoolActivityService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
+import com.ym.mec.common.page.PageInfo;
+import com.ym.mec.common.page.PageUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -39,7 +38,7 @@ public class SchoolActivityController extends BaseController {
     
     @ApiOperation(value = "查询分页", notes = "学校活动- 传入 SchoolActivityWrapper.SchoolActivityQuery") 
     @PostMapping("/page")
-    public HttpResponseResult<PageInfo<SchoolActivityWrapper.SchoolActivity>> page(@RequestBody SchoolActivityWrapper.SchoolActivityQuery query,@RequestHeader Integer coopId) {
+    public HttpResponseResult<PageInfo<SchoolActivityWrapper.SchoolActivity>> page(@RequestBody SchoolActivityWrapper.SchoolActivityQuery query, @RequestHeader Integer coopId) {
 
         if (coopId == null) {
             return succeed();
@@ -47,7 +46,7 @@ public class SchoolActivityController extends BaseController {
         query.setCooperationOrganId(coopId);
         IPage<SchoolActivityWrapper.SchoolActivity> pages = schoolActivityService.selectPage(QueryInfo.getPage(query), query);
         
-        return succeed(QueryInfo.pageInfo(pages));
+        return succeed(PageUtil.pageInfo(pages));
 	}
 
 

mec-web/src/main/java/com/ym/mec/web/controller/school/SchoolActivityDetailController.java

@@ -2,13 +2,14 @@ package com.ym.mec.web.controller.school;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.microsvc.toolkit.common.response.paging.PageInfo;
 import com.microsvc.toolkit.common.response.paging.QueryInfo;
 import com.ym.mec.biz.dal.entity.SchoolActivityDetail;
 import com.ym.mec.biz.dal.wrapper.SchoolActivityDetailWrapper;
 import com.ym.mec.biz.service.SchoolActivityDetailService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
+import com.ym.mec.common.page.PageInfo;
+import com.ym.mec.common.page.PageUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -41,7 +42,7 @@ public class SchoolActivityDetailController extends BaseController {
         
         IPage<SchoolActivityDetail> pages = schoolActivityDetailService.selectPage(QueryInfo.getPage(query), query);
         
-        return succeed(QueryInfo.pageInfo(pages));
+        return succeed(PageUtil.pageInfo(pages));
 	}
     
     @ApiOperation(value = "新增", notes = "活动详情- 传入 SchoolActivityDetailWrapper.SchoolActivityDetail")

mec-web/src/main/java/com/ym/mec/web/controller/school/SchoolActivityDetailUserController.java

@@ -2,13 +2,14 @@ package com.ym.mec.web.controller.school;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.microsvc.toolkit.common.response.paging.PageInfo;
 import com.microsvc.toolkit.common.response.paging.QueryInfo;
 import com.ym.mec.biz.dal.entity.SchoolActivityDetailUser;
 import com.ym.mec.biz.dal.wrapper.SchoolActivityDetailUserWrapper;
 import com.ym.mec.biz.service.SchoolActivityDetailUserService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
+import com.ym.mec.common.page.PageInfo;
+import com.ym.mec.common.page.PageUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -41,7 +42,7 @@ public class SchoolActivityDetailUserController extends BaseController {
         
         IPage<SchoolActivityDetailUser> pages = schoolActivityDetailUserService.selectPage(QueryInfo.getPage(query), query);
         
-        return succeed(QueryInfo.pageInfo(pages));
+        return succeed(PageUtil.pageInfo(pages));
 	}
     
     @ApiOperation(value = "新增", notes = "活动详情人员- 传入 SchoolActivityDetailUserWrapper.SchoolActivityDetailUser")