From 247802cd924aeec325e4a057eac19040e14bd6ac Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Mon, 2 Mar 2026 14:53:33 +0800 Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E6=B7=BB=E5=8A=A0=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD=E5=A2=9E=E5=BC=BA?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E9=A2=86=E5=AF=BC=E6=98=B5=E7=A7=B0=E6=98=BE?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在WmsDeptMapper中新增selectVoListPlus方法支持自定义查询 - 在WmsDeptMapper.xml中实现部门查询SQL并关联用户表获取领导昵称 - 在WmsDeptServiceImpl中重构查询逻辑使用QueryWrapper替代LambdaQueryWrapper - 在WmsDeptVo中新增leaderNickName字段用于显示领导昵称信息 --- .../java/com/klp/domain/vo/WmsDeptVo.java | 4 ++++ .../java/com/klp/mapper/WmsDeptMapper.java | 5 ++++ .../klp/service/impl/WmsDeptServiceImpl.java | 23 +++++++++++-------- .../resources/mapper/klp/WmsDeptMapper.xml | 19 +++++++++++++++ 4 files changed, 41 insertions(+), 10 deletions(-) diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsDeptVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsDeptVo.java index edb70e59..5545c566 100644 --- a/klp-wms/src/main/java/com/klp/domain/vo/WmsDeptVo.java +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsDeptVo.java @@ -65,4 +65,8 @@ public class WmsDeptVo { private String remark; + // 领导昵称 + private String leaderNickName; + + } diff --git a/klp-wms/src/main/java/com/klp/mapper/WmsDeptMapper.java b/klp-wms/src/main/java/com/klp/mapper/WmsDeptMapper.java index bd7677d1..3138e5fd 100644 --- a/klp-wms/src/main/java/com/klp/mapper/WmsDeptMapper.java +++ b/klp-wms/src/main/java/com/klp/mapper/WmsDeptMapper.java @@ -1,8 +1,12 @@ package com.klp.mapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.klp.domain.WmsDept; import com.klp.domain.vo.WmsDeptVo; import com.klp.common.core.mapper.BaseMapperPlus; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * WMS系统部门（树形结构）Mapper接口 @@ -12,4 +16,5 @@ import com.klp.common.core.mapper.BaseMapperPlus; */ public interface WmsDeptMapper extends BaseMapperPlus { + List selectVoListPlus(@Param("ew") QueryWrapper lqw); } diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsDeptServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsDeptServiceImpl.java index f9e015cc..83f00078 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsDeptServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsDeptServiceImpl.java @@ -2,6 +2,7 @@ package com.klp.service.impl; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.klp.common.utils.StringUtils; import lombok.RequiredArgsConstructor; @@ -42,21 +43,23 @@ public class WmsDeptServiceImpl implements IWmsDeptService { */ @Override public List queryList(WmsDeptBo bo) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - return baseMapper.selectVoList(lqw); + QueryWrapper lqw = buildQueryWrapperPlus(bo); + return baseMapper.selectVoListPlus(lqw); } - private LambdaQueryWrapper buildQueryWrapper(WmsDeptBo bo) { + private QueryWrapper buildQueryWrapperPlus(WmsDeptBo bo) { Map params = bo.getParams(); - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.eq(bo.getParentId() != null, WmsDept::getParentId, bo.getParentId()); - lqw.like(StringUtils.isNotBlank(bo.getDeptName()), WmsDept::getDeptName, bo.getDeptName()); - lqw.eq(bo.getOrderNum() != null, WmsDept::getOrderNum, bo.getOrderNum()); - lqw.eq(bo.getLeader() != null, WmsDept::getLeader, bo.getLeader()); - lqw.eq(StringUtils.isNotBlank(bo.getStatus()), WmsDept::getStatus, bo.getStatus()); - return lqw; + QueryWrapper qw = new QueryWrapper<>(); + qw.eq(bo.getParentId() != null, "wd.parent_id", bo.getParentId()); + qw.like(StringUtils.isNotBlank(bo.getDeptName()), "wd.dept_name", bo.getDeptName()); + qw.eq(bo.getOrderNum() != null, "wd.order_num", bo.getOrderNum()); + qw.eq(bo.getLeader() != null, "wd.leader", bo.getLeader()); + qw.eq(StringUtils.isNotBlank(bo.getStatus()), "wd.status", bo.getStatus()); + qw.setEntityClass(WmsDept.class); + return qw; } + /** * 新增WMS系统部门（树形结构） */ diff --git a/klp-wms/src/main/resources/mapper/klp/WmsDeptMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsDeptMapper.xml index 3adbc4b0..529de0f3 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsDeptMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsDeptMapper.xml @@ -18,6 +18,25 @@ +