feat(wms): 添加部门查询功能增强支持领导昵称显示
- 在WmsDeptMapper中新增selectVoListPlus方法支持自定义查询 - 在WmsDeptMapper.xml中实现部门查询SQL并关联用户表获取领导昵称 - 在WmsDeptServiceImpl中重构查询逻辑使用QueryWrapper替代LambdaQueryWrapper - 在WmsDeptVo中新增leaderNickName字段用于显示领导昵称信息
This commit is contained in:
@@ -65,4 +65,8 @@ public class WmsDeptVo {
|
||||
private String remark;
|
||||
|
||||
|
||||
// 领导昵称
|
||||
private String leaderNickName;
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -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<WmsDeptMapper, WmsDept, WmsDeptVo> {
|
||||
|
||||
List<WmsDeptVo> selectVoListPlus(@Param("ew") QueryWrapper<WmsDept> lqw);
|
||||
}
|
||||
|
||||
@@ -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<WmsDeptVo> queryList(WmsDeptBo bo) {
|
||||
LambdaQueryWrapper<WmsDept> lqw = buildQueryWrapper(bo);
|
||||
return baseMapper.selectVoList(lqw);
|
||||
QueryWrapper<WmsDept> lqw = buildQueryWrapperPlus(bo);
|
||||
return baseMapper.selectVoListPlus(lqw);
|
||||
}
|
||||
|
||||
private LambdaQueryWrapper<WmsDept> buildQueryWrapper(WmsDeptBo bo) {
|
||||
private QueryWrapper<WmsDept> buildQueryWrapperPlus(WmsDeptBo bo) {
|
||||
Map<String, Object> params = bo.getParams();
|
||||
LambdaQueryWrapper<WmsDept> 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<WmsDept> 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系统部门(树形结构)
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user