仓库维护添加仓管员

hx-wms/src/main/java/com/fjhx/wms/entity/warehouse/po/Warehouse.java

@@ -2,7 +2,6 @@ package com.fjhx.wms.entity.warehouse.po;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.core.domain.BasePo;
-import java.util.Date;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -34,4 +33,9 @@ public class Warehouse extends BasePo {
      */
     private String remark;
 
+    /**
+     * 仓管员id
+     */
+    private Long keeperId;
+
 }

hx-wms/src/main/java/com/fjhx/wms/entity/warehouse/vo/WarehouseVo.java

@@ -14,4 +14,9 @@ import lombok.Setter;
 @Setter
 public class WarehouseVo extends Warehouse {
 
+    /**
+     * 仓管员名称
+     */
+    private String keeperName;
+
 }

hx-wms/src/main/java/com/fjhx/wms/service/warehouse/impl/WarehouseServiceImpl.java

@@ -4,6 +4,7 @@ import com.fjhx.wms.entity.warehouse.po.Warehouse;
 import com.fjhx.wms.mapper.warehouse.WarehouseMapper;
 import com.fjhx.wms.service.warehouse.WarehouseService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.system.utils.UserUtil;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.wms.entity.warehouse.vo.WarehouseVo;
@@ -12,6 +13,9 @@ import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.fjhx.wms.entity.warehouse.dto.WarehouseDto;
 import cn.hutool.core.bean.BeanUtil;
 
+import java.util.Arrays;
+import java.util.Map;
+
 
 /**
  * <p>
@@ -30,6 +34,8 @@ public class WarehouseServiceImpl extends ServiceImpl<WarehouseMapper, Warehouse
         wrapper.orderByDesc("w", Warehouse::getId);
         wrapper.like("w",Warehouse::getName,dto.getKeyword());
         Page<WarehouseVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        //赋值仓管员名称
+        UserUtil.assignmentNickName(page.getRecords(),Warehouse::getKeeperId,WarehouseVo::setKeeperName);
         return page;
     }
 
@@ -37,6 +43,9 @@ public class WarehouseServiceImpl extends ServiceImpl<WarehouseMapper, Warehouse
     public WarehouseVo detail(Long id) {
         Warehouse Warehouse = this.getById(id);
         WarehouseVo result = BeanUtil.toBean(Warehouse, WarehouseVo.class);
+        //赋值仓管员名称
+        Map<Long, String> nickNameMapByIds = UserUtil.getNickNameMapByIds(Arrays.asList(result.getKeeperId()));
+        result.setKeeperName(nickNameMapByIds.get(result.getKeeperId()));
         return result;
     }
 

hx-wms/src/main/resources/mapper/warehouse/WarehouseMapper.xml

@@ -7,6 +7,7 @@
             w.name,
             w.type,
             w.remark,
+            w.keeper_id,
             w.create_user,
             w.create_time,
             w.update_user,