From d8d87596441eef087da3c69a698ed4829c4376c0 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Sat, 30 Aug 2025 16:53:10 +0800 Subject: [PATCH] =?UTF-8?q?refactor(oa):=20=E9=87=87=E8=B4=AD=E8=AE=A1?= =?UTF-8?q?=E5=88=92=20mapper=20=E6=8E=A5=E5=8F=A3=E5=92=8C=20XML=20?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=94=B9=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将 GearPurchasePlanDetailMapper 接口中的 LambdaQueryWrapper 替换为 QueryWrapper - 更新 GearPurchasePlanDetailMapper.xml 中的 SQL 语句，使用 customSqlSegment 替代 getSqlSegment - 重构 GearPurchasePlanDetailServiceImpl 中的查询方法，使用 QueryWrapper 替代 LambdaQueryWrapper- 优化 GearSupplierServiceImpl 中的查询方法，将 like 查询改为 eq 查询 --- .../mapper/GearPurchasePlanDetailMapper.java | 3 ++- .../GearPurchasePlanDetailServiceImpl.java | 21 ++++++++++++++++++- .../service/impl/GearSupplierServiceImpl.java | 8 +++---- .../oa/GearPurchasePlanDetailMapper.xml | 2 +- 4 files changed, 27 insertions(+), 7 deletions(-) diff --git a/gear-oa/src/main/java/com/gear/oa/mapper/GearPurchasePlanDetailMapper.java b/gear-oa/src/main/java/com/gear/oa/mapper/GearPurchasePlanDetailMapper.java index 11d3f10..ff19e2a 100644 --- a/gear-oa/src/main/java/com/gear/oa/mapper/GearPurchasePlanDetailMapper.java +++ b/gear-oa/src/main/java/com/gear/oa/mapper/GearPurchasePlanDetailMapper.java @@ -1,6 +1,7 @@ package com.gear.oa.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.gear.oa.domain.GearPurchasePlanDetail; import com.gear.oa.domain.vo.GearPurchasePlanDetailVo; @@ -15,5 +16,5 @@ import org.apache.ibatis.annotations.Param; */ public interface GearPurchasePlanDetailMapper extends BaseMapperPlus { - Page selectVoPagePlus(Page build,@Param("ew") LambdaQueryWrapper lqw); + Page selectVoPagePlus(Page build,@Param("ew") QueryWrapper lqw); } diff --git a/gear-oa/src/main/java/com/gear/oa/service/impl/GearPurchasePlanDetailServiceImpl.java b/gear-oa/src/main/java/com/gear/oa/service/impl/GearPurchasePlanDetailServiceImpl.java index e84f0f3..fb3438a 100644 --- a/gear-oa/src/main/java/com/gear/oa/service/impl/GearPurchasePlanDetailServiceImpl.java +++ b/gear-oa/src/main/java/com/gear/oa/service/impl/GearPurchasePlanDetailServiceImpl.java @@ -1,6 +1,7 @@ package com.gear.oa.service.impl; import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.gear.common.utils.StringUtils; import com.gear.common.core.page.TableDataInfo; import com.gear.common.core.domain.PageQuery; @@ -44,11 +45,29 @@ public class GearPurchasePlanDetailServiceImpl implements IGearPurchasePlanDetai */ @Override public TableDataInfo queryPageList(GearPurchasePlanDetailBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); + QueryWrapper lqw = buildQueryWrapperPlus(bo); Page result = baseMapper.selectVoPagePlus(pageQuery.build(), lqw); return TableDataInfo.build(result); } + private QueryWrapper buildQueryWrapperPlus(GearPurchasePlanDetailBo bo) { + QueryWrapper query = Wrappers.query(); + query.eq(StringUtils.isNotBlank(bo.getDetailCode()), "d.detail_code", bo.getDetailCode()); + query.eq(bo.getSupplierId() != null, "d.supplier_id", bo.getSupplierId()); + query.like(bo.getRawMaterialName() != null, "d.raw_material_name", bo.getRawMaterialName()); + query.eq(StringUtils.isNotBlank(bo.getOwner()), "d.owner", bo.getOwner()); + query.eq(bo.getQuantity()!=null, "d.quantity", bo.getQuantity()); + query.eq(StringUtils.isNotBlank(bo.getUnit()), "d.unit", bo.getUnit()); + query.eq(bo.getUnitPrice() != null, "d.unit_price", bo.getUnitPrice()); + query.eq(bo.getTotalAmount() != null, "d.total_amount", bo.getTotalAmount()); + query.eq(StringUtils.isNotBlank(bo.getAnnex()), "d.annex", bo.getAnnex()); + query.eq(bo.getStatus() != null, "d.status", bo.getStatus()); + // 逻辑删除 + query.eq("d.del_flag", 0); + return query; + } + + /** * 查询采购计划明细列表 */ diff --git a/gear-oa/src/main/java/com/gear/oa/service/impl/GearSupplierServiceImpl.java b/gear-oa/src/main/java/com/gear/oa/service/impl/GearSupplierServiceImpl.java index b942036..72c3f1c 100644 --- a/gear-oa/src/main/java/com/gear/oa/service/impl/GearSupplierServiceImpl.java +++ b/gear-oa/src/main/java/com/gear/oa/service/impl/GearSupplierServiceImpl.java @@ -54,10 +54,10 @@ public class GearSupplierServiceImpl implements IGearSupplierService { QueryWrapper query = Wrappers.query(); query.like(StringUtils.isNotBlank(bo.getName()), "s.name", bo.getName()); query.like(StringUtils.isNotBlank(bo.getContactPerson()), "s.contact_person", bo.getContactPerson()); - query.like(StringUtils.isNotBlank(bo.getPhone()), "s.phone", bo.getPhone()); - query.like(StringUtils.isNotBlank(bo.getAddress()), "s.address", bo.getAddress()); - query.like(StringUtils.isNotBlank(bo.getRemark()), "s.remark", bo.getRemark()); - query.like(bo.getTypeId()!=null, "s.type_id", bo.getTypeId()); + query.eq(StringUtils.isNotBlank(bo.getPhone()), "s.phone", bo.getPhone()); + query.eq(StringUtils.isNotBlank(bo.getAddress()), "s.address", bo.getAddress()); + query.eq(StringUtils.isNotBlank(bo.getRemark()), "s.remark", bo.getRemark()); + query.eq(bo.getTypeId()!=null, "s.type_id", bo.getTypeId()); //逻辑删除 query.eq("s.del_flag", 0); return query; diff --git a/gear-oa/src/main/resources/mapper/oa/GearPurchasePlanDetailMapper.xml b/gear-oa/src/main/resources/mapper/oa/GearPurchasePlanDetailMapper.xml index c655f04..ebb570c 100644 --- a/gear-oa/src/main/resources/mapper/oa/GearPurchasePlanDetailMapper.xml +++ b/gear-oa/src/main/resources/mapper/oa/GearPurchasePlanDetailMapper.xml @@ -44,7 +44,7 @@ s.name as supplierName from gear_purchase_plan_detail d left join gear_supplier s on d.supplier_id = s.supplier_id and s.del_flag = 0 - ${ew.getSqlSegment()} + ${ew.customSqlSegment()}