修改bug不良信息功能

src/main/java/com/glxp/api/controller/anno/AnncmntDevController.java

@@ -4,7 +4,8 @@ package com.glxp.api.controller.anno;
 import cn.hutool.core.lang.func.Func;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.glxp.api.annotation.AuthRuleAnnotation;
 import com.glxp.api.annotation.Log;
@@ -15,6 +16,7 @@ import com.glxp.api.constant.BusinessType;
 import com.glxp.api.controller.BaseController;
 import com.glxp.api.entity.anno.AnncmntDevEntity;
 import com.glxp.api.entity.auth.SysCustomConfigDetailEntity;
+import com.glxp.api.entity.stat.AnncmntYlqxzcrEntity;
 import com.glxp.api.req.anno.AnncmntDevEntityRequest;
 import com.glxp.api.req.auth.SysCustomConfigDetailRequest;
 import com.glxp.api.req.system.DeleteRequest;
@@ -51,11 +53,12 @@ public class AnncmntDevController extends BaseController {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
-        IPage page = new Page(request.getPage(),request.getLimit());
+        int offset = (request.getPage() - 1) * request.getLimit();
-        IPage<AnncmntDevEntity> pages = anncmntDevService.page(page, getQueryWrapper(request));
+        Page<AnncmntDevEntity> pages =  PageHelper.offsetPage(offset, request.getLimit());
+        List<AnncmntDevEntity> list = anncmntDevService.list(getQueryWrapper(request));
         PageSimpleResponse<AnncmntDevEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pages.getTotal());
-        pageSimpleResponse.setList(pages.getRecords());
+        pageSimpleResponse.setList(list);
 
         return ResultVOUtils.success(pageSimpleResponse);
     }

src/main/java/com/glxp/api/controller/anno/AnncmntManuCertController.java

@@ -3,7 +3,8 @@ package com.glxp.api.controller.anno;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
 import com.glxp.api.annotation.AuthRuleAnnotation;
 import com.glxp.api.annotation.Log;
 import com.glxp.api.common.enums.ResultEnum;
@@ -11,6 +12,7 @@ import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.constant.BusinessType;
 import com.glxp.api.controller.BaseController;
+import com.glxp.api.entity.anno.AnncmntDevEntity;
 import com.glxp.api.entity.stat.AnncmntManuCertEntity;
 import com.glxp.api.entity.stat.AnncmntManuEntity;
 import com.glxp.api.req.anno.AnncmntDevEntityRequest;
@@ -29,6 +31,7 @@ import springfox.documentation.annotations.ApiIgnore;
 
 import javax.validation.Valid;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 用户信息
@@ -49,11 +52,12 @@ public class AnncmntManuCertController extends BaseController {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
-        IPage page = new Page(request.getPage(),request.getLimit());
+        int offset = (request.getPage() - 1) * request.getLimit();
-        IPage<AnncmntManuCertEntity> pages = anncmntManuCertService.page(page, getQueryWrapper(request));
+        Page<AnncmntManuCertEntity> pages =  PageHelper.offsetPage(offset, request.getLimit());
+        List<AnncmntManuCertEntity> list = anncmntManuCertService.list(getQueryWrapper(request));
         PageSimpleResponse<AnncmntManuCertEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pages.getTotal());
-        pageSimpleResponse.setList(pages.getRecords());
+        pageSimpleResponse.setList(list);
 
         return ResultVOUtils.success(pageSimpleResponse);
     }

src/main/java/com/glxp/api/controller/anno/AnncmntManuController.java

@@ -3,7 +3,8 @@ package com.glxp.api.controller.anno;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
 import com.glxp.api.annotation.AuthRuleAnnotation;
 import com.glxp.api.annotation.Log;
 import com.glxp.api.common.enums.ResultEnum;
@@ -13,6 +14,7 @@ import com.glxp.api.constant.BusinessType;
 import com.glxp.api.controller.BaseController;
 import com.glxp.api.dto.DictDto;
 import com.glxp.api.entity.anno.AnncmntDevEntity;
+import com.glxp.api.entity.stat.AnncmntManuCertEntity;
 import com.glxp.api.entity.stat.AnncmntManuEntity;
 import com.glxp.api.entity.stat.AnncmntYlqxzcrEntity;
 import com.glxp.api.req.anno.AnncmntDevEntityRequest;
@@ -54,11 +56,12 @@ public class AnncmntManuController extends BaseController {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
-        IPage page = new Page(request.getPage(),request.getLimit());
+        int offset = (request.getPage() - 1) * request.getLimit();
-        IPage<AnncmntManuEntity> pages = anncmntManuService.page(page, getQueryWrapper(request));
+        Page<AnncmntManuEntity> pages =  PageHelper.offsetPage(offset, request.getLimit());
+        List<AnncmntManuEntity> list = anncmntManuService.list(getQueryWrapper(request));
         PageSimpleResponse<AnncmntManuEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pages.getTotal());
-        pageSimpleResponse.setList(pages.getRecords());
+        pageSimpleResponse.setList(list);
 
         return ResultVOUtils.success(pageSimpleResponse);
     }

src/main/java/com/glxp/api/controller/anno/AnncmntProductBatchController.java

@@ -3,7 +3,8 @@ package com.glxp.api.controller.anno;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
 import com.glxp.api.annotation.AuthRuleAnnotation;
 import com.glxp.api.annotation.Log;
 import com.glxp.api.common.enums.ResultEnum;
@@ -12,6 +13,7 @@ import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.constant.BusinessType;
 import com.glxp.api.controller.BaseController;
 import com.glxp.api.entity.stat.AnncmntManuCertEntity;
+import com.glxp.api.entity.stat.AnncmntManuEntity;
 import com.glxp.api.entity.stat.AnncmntProductBatchEntity;
 import com.glxp.api.req.anno.AnncmntManuCertEntityRequest;
 import com.glxp.api.req.anno.AnncmntProductBatchEntityRequest;
@@ -29,6 +31,7 @@ import springfox.documentation.annotations.ApiIgnore;
 
 import javax.validation.Valid;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 用户信息
@@ -49,11 +52,12 @@ public class AnncmntProductBatchController extends BaseController {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
-        IPage page = new Page(request.getPage(),request.getLimit());
+        int offset = (request.getPage() - 1) * request.getLimit();
-        IPage<AnncmntProductBatchEntity> pages = anncmntProductBatchService.page(page, getQueryWrapper(request));
+        Page<AnncmntProductBatchEntity> pages =  PageHelper.offsetPage(offset, request.getLimit());
+        List<AnncmntProductBatchEntity> list = anncmntProductBatchService.list(getQueryWrapper(request));
         PageSimpleResponse<AnncmntProductBatchEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pages.getTotal());
-        pageSimpleResponse.setList(pages.getRecords());
+        pageSimpleResponse.setList(list);
 
         return ResultVOUtils.success(pageSimpleResponse);
     }

src/main/java/com/glxp/api/controller/anno/AnncmntProductController.java

@@ -3,7 +3,8 @@ package com.glxp.api.controller.anno;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
 import com.glxp.api.annotation.AuthRuleAnnotation;
 import com.glxp.api.annotation.Log;
 import com.glxp.api.common.enums.ResultEnum;
@@ -12,6 +13,7 @@ import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.constant.BusinessType;
 import com.glxp.api.controller.BaseController;
 import com.glxp.api.entity.stat.AnncmntManuEntity;
+import com.glxp.api.entity.stat.AnncmntProductBatchEntity;
 import com.glxp.api.entity.stat.AnncmntProductEntity;
 import com.glxp.api.req.anno.AnncmntDevEntityRequest;
 import com.glxp.api.req.anno.AnncmntProductEntityRequest;
@@ -29,6 +31,7 @@ import springfox.documentation.annotations.ApiIgnore;
 
 import javax.validation.Valid;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 用户信息
@@ -49,11 +52,12 @@ public class AnncmntProductController extends BaseController {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
-        IPage page = new Page(request.getPage(),request.getLimit());
+        int offset = (request.getPage() - 1) * request.getLimit();
-        IPage<AnncmntProductEntity> pages = anncmntProductService.page(page, getQueryWrapper(request));
+        Page<AnncmntProductEntity> pages =  PageHelper.offsetPage(offset, request.getLimit());
+        List<AnncmntProductEntity> list = anncmntProductService.list(getQueryWrapper(request));
         PageSimpleResponse<AnncmntProductEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pages.getTotal());
-        pageSimpleResponse.setList(pages.getRecords());
+        pageSimpleResponse.setList(list);
 
         return ResultVOUtils.success(pageSimpleResponse);
     }

src/main/java/com/glxp/api/controller/anno/AnncmntYlqxzcrController.java

@@ -3,7 +3,8 @@ package com.glxp.api.controller.anno;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
 import com.glxp.api.annotation.AuthRuleAnnotation;
 import com.glxp.api.annotation.Log;
 import com.glxp.api.common.enums.ResultEnum;
@@ -51,11 +52,12 @@ public class AnncmntYlqxzcrController extends BaseController {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
-        IPage page = new Page(request.getPage(),request.getLimit());
+        int offset = (request.getPage() - 1) * request.getLimit();
-        IPage<AnncmntYlqxzcrEntity> pages = anncmntYlqxzcrService.page(page, getQueryWrapper(request));
+        Page<AnncmntYlqxzcrEntity> pages =  PageHelper.offsetPage(offset, request.getLimit());
+        List<AnncmntYlqxzcrEntity> list = anncmntYlqxzcrService.list(getQueryWrapper(request));
         PageSimpleResponse<AnncmntYlqxzcrEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pages.getTotal());
-        pageSimpleResponse.setList(pages.getRecords());
+        pageSimpleResponse.setList(list);
 
         return ResultVOUtils.success(pageSimpleResponse);
     }

src/main/java/com/glxp/api/controller/anno/AnncmntYlqxzczhController.java

@@ -3,7 +3,8 @@ package com.glxp.api.controller.anno;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
 import com.glxp.api.annotation.AuthRuleAnnotation;
 import com.glxp.api.annotation.Log;
 import com.glxp.api.common.enums.ResultEnum;
@@ -52,11 +53,12 @@ public class AnncmntYlqxzczhController extends BaseController {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
-        IPage page = new Page(request.getPage(),request.getLimit());
+        int offset = (request.getPage() - 1) * request.getLimit();
-        IPage<AnncmntYlqxzczhEntity> pages = anncmntYlqxzczhService.page(page, getQueryWrapper(request));
+        Page<AnncmntYlqxzczhEntity> pages =  PageHelper.offsetPage(offset, request.getLimit());
+        List<AnncmntYlqxzczhEntity> list = anncmntYlqxzczhService.list(getQueryWrapper(request));
         PageSimpleResponse<AnncmntYlqxzczhEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pages.getTotal());
-        pageSimpleResponse.setList(pages.getRecords());
+        pageSimpleResponse.setList(list);
 
         return ResultVOUtils.success(pageSimpleResponse);
     }