From ff9330816a2663dbc5e77a18dd5ac772b3804896 Mon Sep 17 00:00:00 2001 From: luolm <470431449@qq.com> Date: Sat, 12 Oct 2024 09:48:51 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E6=9F=A5=E8=AF=A2=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=8A=A0=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../product/bomnew/api/user/BomReportApi.java | 42 ++++++++++--------- .../mapper/master/MaterialMainMapper.java | 3 +- .../bomnew/pojo/dto/MaterialQueryDTO.java | 6 +++ .../mapper/master/MaterialMainMapper.xml | 19 +++++++-- 4 files changed, 47 insertions(+), 23 deletions(-) diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/BomReportApi.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/BomReportApi.java index 23340aba..839fecac 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/BomReportApi.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/BomReportApi.java @@ -7,9 +7,11 @@ import cn.hutool.core.lang.TypeReference; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.google.common.collect.ImmutableList; import com.nflg.product.base.core.api.BaseApi; import com.nflg.product.base.core.exception.NflgBusinessException; +import com.nflg.product.base.core.vo.PageVO; import com.nflg.product.bomnew.constant.ReportConstant; import com.nflg.product.bomnew.pojo.dto.MaterialQueryDTO; import com.nflg.product.bomnew.pojo.entity.MaterialMainEntity; @@ -291,26 +293,28 @@ public class BomReportApi extends BaseApi { @PostMapping("queryMaterial") @ApiOperation("物料查询") - public ResultVO> materialQuery(@RequestBody MaterialQueryDTO queryParam){ - List result = materialMainService.getBaseMapper().queryMaterial(queryParam); - //排序 - if(StrUtil.isNotBlank(queryParam.getMaterialNo())) { - result.forEach(u->{ - u.setOrderNo(StrUtil.replace(u.getMaterialNo(),queryParam.getMaterialNo(),"0")); - }); + public ResultVO> materialQuery(@RequestBody MaterialQueryDTO queryParam){ - } - if(StrUtil.isNotBlank(queryParam.getDrawingNo())) { - result.forEach(u->{ - u.setOrderNo(StrUtil.replace(u.getDrawingNo(),queryParam.getDrawingNo(),"0")); - }); - } - if(StrUtil.isNotBlank(queryParam.getMaterialDesc())) { - result.forEach(u->{ - u.setOrderNo(StrUtil.replace(u.getMaterialDesc(),queryParam.getMaterialDesc(),"0")); - }); - } - result= result.stream().sorted( Comparator.comparing(MaterialQueryResult::getOrderNo)).collect(Collectors.toList()); + Page page = new PageVO<>(queryParam.getPage(), queryParam.getPageSize()); + Page result = materialMainService.getBaseMapper().queryMaterial(page , queryParam); + //排序 +// if(StrUtil.isNotBlank(queryParam.getMaterialNo())) { +// result.forEach(u->{ +// u.setOrderNo(StrUtil.replace(u.getMaterialNo(),queryParam.getMaterialNo(),"0")); +// }); +// +// } +// if(StrUtil.isNotBlank(queryParam.getDrawingNo())) { +// result.forEach(u->{ +// u.setOrderNo(StrUtil.replace(u.getDrawingNo(),queryParam.getDrawingNo(),"0")); +// }); +// } +// if(StrUtil.isNotBlank(queryParam.getMaterialDesc())) { +// result.forEach(u->{ +// u.setOrderNo(StrUtil.replace(u.getMaterialDesc(),queryParam.getMaterialDesc(),"0")); +// }); +// } +// result= result.stream().sorted( Comparator.comparing(MaterialQueryResult::getOrderNo)).collect(Collectors.toList()); return ResultVO.success(result); } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/MaterialMainMapper.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/MaterialMainMapper.java index ec9de059..7dcd7876 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/MaterialMainMapper.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/MaterialMainMapper.java @@ -1,6 +1,7 @@ package com.nflg.product.bomnew.mapper.master; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.nflg.product.bomnew.pojo.dto.CategoryExcelDTO; import com.nflg.product.bomnew.pojo.dto.MaterialQueryDTO; import com.nflg.product.bomnew.pojo.entity.MaterialMainEntity; @@ -61,5 +62,5 @@ public interface MaterialMainMapper extends BaseMapper { String getUserDepartmentDptCode(@Param("rowId") Long rowId); - List queryMaterial(@Param("query") MaterialQueryDTO query); + Page queryMaterial(Page page, @Param("query") MaterialQueryDTO query); } diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/MaterialQueryDTO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/MaterialQueryDTO.java index 2056d648..6e4439d2 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/MaterialQueryDTO.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/MaterialQueryDTO.java @@ -26,6 +26,12 @@ public class MaterialQueryDTO implements Serializable { @ApiModelProperty(value = "物料描述") private String materialDesc; + // 设置每页显示条数 + private Long pageSize = 20L; + + // 当前页 + private Long page = 1L; + private static final long serialVersionUID = 1L; diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/MaterialMainMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/MaterialMainMapper.xml index 9497fd59..9b3645a0 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/MaterialMainMapper.xml +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/MaterialMainMapper.xml @@ -203,18 +203,31 @@