diff --git a/klp-wms/src/main/java/com/klp/mapper/WmsProductSalesScriptMapper.java b/klp-wms/src/main/java/com/klp/mapper/WmsProductSalesScriptMapper.java index febe9a50..a7c4e13d 100644 --- a/klp-wms/src/main/java/com/klp/mapper/WmsProductSalesScriptMapper.java +++ b/klp-wms/src/main/java/com/klp/mapper/WmsProductSalesScriptMapper.java @@ -1,11 +1,10 @@ package com.klp.mapper; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.klp.domain.WmsProductSalesScript; +import com.klp.domain.bo.WmsProductSalesScriptBo; import com.klp.domain.vo.WmsProductSalesScriptVo; import com.klp.common.core.mapper.BaseMapperPlus; -import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; /** @@ -16,5 +15,5 @@ import org.apache.ibatis.annotations.Param; */ public interface WmsProductSalesScriptMapper extends BaseMapperPlus { - Page selectVoPagePlus(Page build,@Param("ew") LambdaQueryWrapper lqw); + Page selectVoPagePlus(Page build,@Param("bo") WmsProductSalesScriptBo bo); } diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsProductSalesScriptServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsProductSalesScriptServiceImpl.java index 84db4bff..8b667645 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsProductSalesScriptServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsProductSalesScriptServiceImpl.java @@ -55,8 +55,7 @@ public class WmsProductSalesScriptServiceImpl implements IWmsProductSalesScriptS */ @Override public TableDataInfo queryPageList(WmsProductSalesScriptBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPagePlus(pageQuery.build(), lqw); + Page result = baseMapper.selectVoPagePlus(pageQuery.build(),bo); return TableDataInfo.build(result); } diff --git a/klp-wms/src/main/resources/mapper/klp/WmsProductSalesScriptMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsProductSalesScriptMapper.xml index b053b014..7120001a 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsProductSalesScriptMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsProductSalesScriptMapper.xml @@ -21,8 +21,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"