From 2c8b642531a2eb50382486ff54f50ff99a8d9843 Mon Sep 17 00:00:00 2001 From: liyawei Date: Mon, 4 Jul 2022 11:37:13 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E4=B8=8A=E6=8A=A5=E5=BA=93?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=A1=B9-=E5=88=97=E8=A1=A8=E5=88=86?= =?UTF-8?q?=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ParamsCollectManifestEOController.java | 2 +- .../controller/ParamsReportDetailEOController.java | 11 ++++++++--- .../report/mapper/ParamsReportDetailEOMapper.java | 3 +++ .../report/mapper/xml/ParamsReportDetailEOMapper.xml | 7 +++++++ .../report/service/IParamsReportDetailEOService.java | 4 +++- .../service/impl/ParamsReportDetailEOServiceImpl.java | 9 ++++++--- 6 files changed, 28 insertions(+), 8 deletions(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java index d4c154ac0..4b1b464df 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java @@ -76,7 +76,7 @@ public class ParamsCollectManifestEOController extends JeroController queryList(ParamsCollectManifestEO paramsCollectManifestEO, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="500") Integer pageSize, + @RequestParam(name="pageSize", defaultValue="100") Integer pageSize, @RequestParam(name = "cut") String cut) { if (StringUtils.isNotEmpty(paramsCollectManifestEO.getNioNumber())) { paramsCollectManifestEO.setNioNumber(paramsCollectManifestEO.getNioNumber().replace("%","\\%")); diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportDetailEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportDetailEOController.java index bf1312780..b13e110ea 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportDetailEOController.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/controller/ParamsReportDetailEOController.java @@ -1,6 +1,8 @@ package com.jero.modules.cert.report.controller; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.system.base.controller.JeroController; @@ -62,8 +64,10 @@ public class ParamsReportDetailEOController extends JeroController>> queryList(ParamsReportDetailEO paramsReportDetailEO, - @RequestParam(name = "cut") String cut) { + public Result queryList(ParamsReportDetailEO paramsReportDetailEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="100") Integer pageSize, + @RequestParam(name = "cut") String cut) { if (StringUtils.isNotEmpty(paramsReportDetailEO.getNioNumber())) { paramsReportDetailEO.setNioNumber(paramsReportDetailEO.getNioNumber().replace("%","\\%")); } @@ -77,7 +81,8 @@ public class ParamsReportDetailEOController extends JeroController> list = paramsReportDetailEOService.queryList(paramsReportDetailEO, cut); + IPage page = new Page(pageNo, pageSize); + IPage list = paramsReportDetailEOService.queryList(page, paramsReportDetailEO, cut); return Result.OK(list); } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportDetailEOMapper.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportDetailEOMapper.java index ec54aeed7..53781f175 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportDetailEOMapper.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportDetailEOMapper.java @@ -1,6 +1,7 @@ package com.jero.modules.cert.report.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO; import com.jero.modules.cert.report.entity.ParamsReportDetailEO; import com.jero.modules.cert.report.vo.ParamsReportDetailVO; @@ -19,6 +20,8 @@ public interface ParamsReportDetailEOMapper extends BaseMapper listInfo(@Param("paramsReportDetailEO") ParamsReportDetailEO paramsReportDetailEO); + IPage pageInfo(@Param("page") IPage page, @Param("paramsReportDetailEO") ParamsReportDetailEO paramsReportDetailEO); + List> listInfoForExport(@Param("idList") List idList, @Param("paramsReportDetailVO") ParamsReportDetailVO paramsReportDetailVO); diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml index 060cf0d4e..b539d2703 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml @@ -91,6 +91,13 @@ order by nio_number asc, sync_time desc + +