页面展示创建者名称

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/ItembasicController.java

@@ -1,12 +1,12 @@
 package com.win.module.wms.controller.itembasic;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.win.framework.common.enums.CommonStatusEnum;
 import com.win.framework.common.pojo.CommonResult;
 import com.win.framework.common.pojo.PageResult;
 import com.win.framework.excel.core.util.ExcelUtils;
 import com.win.framework.operatelog.core.annotations.OperateLog;
 import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.itembasic.vo.*;
 import com.win.module.wms.convert.itembasic.ItembasicConvert;
 import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
@@ -112,10 +112,11 @@ public class ItembasicController {
         PageResult<ItembasicDO> pageResult = itembasicService.getItembasicPage(pageVO);
         PageResult<ItembasicRespVO> result = ItembasicConvert.INSTANCE.convertPage(pageResult);
         for(ItembasicRespVO vo : result.getList()) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
             //后端创建个字段作为前端展示的虚拟字段
-            String nickname = userApi.getUser(Long.valueOf(vo.getCreator())).getNickname();
+            vo.setCreator(user.getNickname());
         }
-        return success(ItembasicConvert.INSTANCE.convertPage(pageResult));
+        return success(result);
     }
 
 
@@ -136,12 +137,12 @@ public class ItembasicController {
     public void importTemplate(HttpServletResponse response) throws IOException {
         // 手动创建导出 demo
         List<ItembasicImportExcelVo> list = Arrays.asList(
-                ItembasicImportExcelVo.builder().code("yunai").uom(1).isStdPack(1).enableBuy(1)
-                        .enableMake(1).status(CommonStatusEnum.ENABLE.getStatus()).enableOutsourcing(1)
-                        .isRecycled(1).isPhantom(1).abcClass(1).type(1).validityDays(1).available(1).build(),
-                ItembasicImportExcelVo.builder().code("yuanma").uom(2).isStdPack(2).enableBuy(2)
-                        .enableMake(2).status(CommonStatusEnum.DISABLE.getStatus()).enableOutsourcing(2)
-                        .isRecycled(2).isPhantom(2).abcClass(2).type(2).validityDays(2).available(2).build()
+                ItembasicImportExcelVo.builder().code("yunai").uom("1").isStdPack("1").enableBuy("1")
+                        .enableMake("1").status("1").enableOutsourcing("1")
+                        .isRecycled("1").isPhantom("1").abcClass("1").type("1").validityDays(1).available("1").build(),
+                ItembasicImportExcelVo.builder().code("yuanma").uom("2").isStdPack("2").enableBuy("2")
+                        .enableMake("2").status("2").enableOutsourcing("2")
+                        .isRecycled("2").isPhantom("2").abcClass("2").type("2").validityDays(1).available("2").build()
         );
 
         // 输出

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/vo/ItembasicImportExcelVo.java

@@ -22,11 +22,11 @@ public class ItembasicImportExcelVo {
 
     @ExcelProperty(value = "状态", converter = DictConvert.class)
     @DictFormat(DictTypeConstants.ITEM_STATUS)
-    private Integer status;
+    private String status;
 
     @ExcelProperty(value = "计量单位", converter = DictConvert.class)
     @DictFormat(DictTypeConstants.UOM)
-    private Integer uom;
+    private String uom;
 
     @ExcelProperty(value = "是否标包", converter = DictConvert.class)
     @DictFormat(DictTypeConstants.TRUE_FALSE)
@@ -54,11 +54,11 @@ public class ItembasicImportExcelVo {
 
     @ExcelProperty(value = "ABC类", converter = DictConvert.class)
     @DictFormat(DictTypeConstants.ABC_CLASS)
-    private Integer abcClass;
+    private String abcClass;
 
     @ExcelProperty(value = "类型", converter = DictConvert.class)
     @DictFormat(DictTypeConstants.ITEM_TYPE)
-    private Integer type;
+    private String type;
     @ExcelProperty(value = "有效天数")
     private Integer validityDays;
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/itembasic/ItembasicDO.java

@@ -1,14 +1,13 @@
 package com.win.module.wms.dal.dataobject.itembasic;
 
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.sun.xml.bind.v2.TODO;
+import com.win.framework.mybatis.core.dataobject.BaseDO;
 import lombok.*;
-import java.util.*;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
+
 import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
-import com.win.framework.mybatis.core.dataobject.BaseDO;
 
 /**
  * 物品基本信息 DO