认证-上报库参数项-列表分页

2022-07-04 11:37:13 +08:00
parent e644205ca2
commit 2c8b642531
6 changed files with 28 additions and 8 deletions
@@ -76,7 +76,7 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
 //	@RequiresPermissions("params:collectManifest:list")
 	public Result<?> 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("%","\\%"));
@@ -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<ParamsReportD
 	@ApiOperation(value="上报库参数项-列表查询", notes="上报库参数项-列表查询")
 	@GetMapping(value = "/list")
 //	@RequiresPermissions("report:detail:list")
-	public Result<List<Map<String, Object>>> 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<ParamsReportD
 			paramsReportDetailEO.setDre(paramsReportDetailEO.getDre().replace("%","\\%"));
 		}

-		List<Map<String, Object>> list = paramsReportDetailEOService.queryList(paramsReportDetailEO, cut);
+		IPage page = new Page(pageNo, pageSize);
+		IPage list = paramsReportDetailEOService.queryList(page, paramsReportDetailEO, cut);
 		return Result.OK(list);
 	}

@@ -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<ParamsReportDetai

    List<ParamsReportDetailEO> listInfo(@Param("paramsReportDetailEO") ParamsReportDetailEO paramsReportDetailEO);

+    IPage pageInfo(@Param("page") IPage page, @Param("paramsReportDetailEO") ParamsReportDetailEO paramsReportDetailEO);
+
    List<Map<String, Object>> listInfoForExport(@Param("idList") List<String> idList,
                                                @Param("paramsReportDetailVO") ParamsReportDetailVO paramsReportDetailVO);

@@ -91,6 +91,13 @@
        order by nio_number asc, sync_time desc
    </select>

+    <select id="pageInfo" resultMap="ParamsReportDetailEOResultMap">
+        select *
+        from params_report_detail
+        <include refid="BaseQuerySql"/>
+        order by nio_number asc, sync_time desc
+    </select>
+
    <select id="listInfoForExport" resultType="java.util.LinkedHashMap">
        select
        prd.id as id,
@@ -1,5 +1,6 @@
 package com.jero.modules.cert.report.service;

+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.jero.modules.cert.report.entity.ParamsReportDetailEO;
 import com.jero.modules.cert.report.vo.ParamsReportDetailVO;
@@ -19,11 +20,12 @@ public interface IParamsReportDetailEOService extends IService<ParamsReportDetai

 	/**
 	 * 列表查询
+	 * @param page
 	 * @param paramsReportDetailEO
 	 * @param cut
 	 * @return
 	 */
-	List<Map<String, Object>> queryList(ParamsReportDetailEO paramsReportDetailEO, String cut);
+	IPage queryList(IPage page, ParamsReportDetailEO paramsReportDetailEO, String cut);

 	/**
 	 * 列表表头中英文切换
@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.ZipUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
 import com.jero.common.constant.enums.CutEnum;
@@ -101,10 +102,11 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 	 * @return
 	 */
 	@Override
-	public List<Map<String, Object>> queryList(ParamsReportDetailEO paramsReportDetailEO, String cut) {
+	public IPage queryList(IPage page, ParamsReportDetailEO paramsReportDetailEO, String cut) {
 		String paramsManifestId = paramsReportDetailEO.getParamsManifestId();

-		List<ParamsReportDetailEO> list = paramsReportDetailEOMapper.listInfo(paramsReportDetailEO); // 查询固定列
+		IPage pageInfo = paramsReportDetailEOMapper.pageInfo(page, paramsReportDetailEO); // 查询固定列
+		List<ParamsReportDetailEO> list = pageInfo.getRecords(); // 查询固定列
 		List<ParamsReportConfigEO> paramsConfigEOList = paramsReportConfigEOService.queryList(paramsManifestId); // 查询配置列

 		// 普通数据字典
@@ -193,7 +195,8 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 			listMap.add(manifestMap);
 		});

-		return listMap;
+		pageInfo.setRecords(listMap);
+		return pageInfo;
 	}

 	/**