diff --git a/klp-wms/src/main/java/com/klp/mapper/WmsFinancialDocumentMapper.java b/klp-wms/src/main/java/com/klp/mapper/WmsFinancialDocumentMapper.java index 8cc55e4a..a9531d44 100644 --- a/klp-wms/src/main/java/com/klp/mapper/WmsFinancialDocumentMapper.java +++ b/klp-wms/src/main/java/com/klp/mapper/WmsFinancialDocumentMapper.java @@ -1,6 +1,7 @@ package com.klp.mapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.klp.domain.WmsFinancialDocument; import com.klp.domain.vo.WmsFinancialDocumentVo; @@ -15,5 +16,5 @@ import org.apache.ibatis.annotations.Param; */ public interface WmsFinancialDocumentMapper extends BaseMapperPlus { - Page selectVoPageDetail(Page build,@Param("ew") LambdaQueryWrapper lqw); + Page selectVoPageDetail(Page build,@Param("ew") QueryWrapper lqw); } diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsFinancialDocumentServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsFinancialDocumentServiceImpl.java index b7a824eb..ebf5d32d 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsFinancialDocumentServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsFinancialDocumentServiceImpl.java @@ -1,6 +1,7 @@ package com.klp.service.impl; import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.klp.common.core.page.TableDataInfo; import com.klp.common.core.domain.PageQuery; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -59,11 +60,38 @@ public class WmsFinancialDocumentServiceImpl implements IWmsFinancialDocumentSer */ @Override public TableDataInfo queryPageListDetail(WmsFinancialDocumentBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); + QueryWrapper lqw = buildQueryWrapperDetail(bo); Page result = baseMapper.selectVoPageDetail(pageQuery.build(), lqw); return TableDataInfo.build(result); } + private QueryWrapper buildQueryWrapperDetail(WmsFinancialDocumentBo bo) { + Map params = bo.getParams(); + QueryWrapper qw = Wrappers.query(); + // 添加逻辑删除条件 + qw.eq("wfd.del_flag", 0); + // 添加查询条件 + if (StringUtils.isNotBlank(bo.getDocNo())) { + qw.eq("wfd.doc_no", bo.getDocNo()); + } + if (StringUtils.isNotBlank(bo.getDocType())) { + qw.eq("wfd.doc_type", bo.getDocType()); + } + if (bo.getDocDate() != null) { + qw.eq("wfd.doc_date", bo.getDocDate()); + } + if (bo.getAmount() != null) { + qw.eq("wfd.amount", bo.getAmount()); + } + if (bo.getRelatedOrderId() != null) { + qw.eq("wfd.related_order_id", bo.getRelatedOrderId()); + } + if (StringUtils.isNotBlank(bo.getStatus())) { + qw.eq("wfd.status", bo.getStatus()); + } + return qw; + } + /**