库存修改申请/记录 前端展示创建者名称

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/InventorymoveJobMainController.java

@@ -2,6 +2,7 @@ package com.win.module.wms.controller.inventorymoveJob;
 
 import com.win.framework.common.pojo.CustomConditions;
 import com.win.framework.dict.core.util.DictFrameworkUtils;
+import com.win.module.system.api.dept.DeptApi;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.inventorymoveRequest.vo.InventorymoveRequestMainExcelVO;
@@ -54,7 +55,8 @@ public class InventorymoveJobMainController {
 
     @Resource
     private AdminUserApi userApi;
-
+    @Resource
+    private DeptApi deptApi;
     @PostMapping("/create")
     @Operation(summary = "创建库存转移任务主")
     @PreAuthorize("@ss.hasPermission('wms:inventorymove-job-main:create')")
@@ -102,7 +104,14 @@ public class InventorymoveJobMainController {
     @PreAuthorize("@ss.hasPermission('wms:inventorymove-job-main:query')")
     public CommonResult<PageResult<InventorymoveJobMainRespVO>> getInventorymoveJobMainPage(@Valid InventorymoveJobMainPageReqVO pageVO) {
         PageResult<InventorymoveJobMainDO> pageResult = inventorymoveJobMainService.getInventorymoveJobMainPage(pageVO);
-        return success(InventorymoveJobMainConvert.INSTANCE.convertPage(pageResult));
+        PageResult<InventorymoveJobMainRespVO> result = InventorymoveJobMainConvert.INSTANCE.convertPage(pageResult);
+        for(InventorymoveJobMainRespVO vo : result.getList()) {
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname());
+            vo.setUpdater(userApi.getUser(Long.valueOf(vo.getUpdater())).getNickname());
+            vo.setDepartmentCode(deptApi.getDept(userApi.getUser(Long.valueOf(vo.getCreator())).getDeptId()).getName());
+        }
+        return success(result);
     }
 
     @PostMapping("/senior")
@@ -114,7 +123,9 @@ public class InventorymoveJobMainController {
         for(InventorymoveJobMainRespVO vo : result.getList()) {
             //后端创建个字段作为前端展示的虚拟字段
             vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname());
-            vo.setUpdater(userApi.getUser(Long.valueOf(vo.getUpdater())).getNickname());        }
+            vo.setUpdater(userApi.getUser(Long.valueOf(vo.getUpdater())).getNickname());
+            vo.setDepartmentCode(deptApi.getDept(userApi.getUser(Long.valueOf(vo.getCreator())).getDeptId()).getName());
+        }
         return success(result);
     }
     

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/InventorymoveRecordMainController.java

@@ -2,10 +2,13 @@ package com.win.module.wms.controller.inventorymoveRecord;
 
 import com.win.framework.common.pojo.CustomConditions;
 import com.win.framework.dict.core.util.DictFrameworkUtils;
+import com.win.module.system.api.dept.DeptApi;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
+import com.win.module.wms.controller.inventorymoveJob.vo.InventorymoveJobMainRespVO;
 import com.win.module.wms.controller.inventorymoveRequest.vo.InventorymoveRequestMainExcelVO;
 import com.win.module.wms.controller.inventorymoveRequest.vo.InventorymoveRequestMainRespVO;
+import com.win.module.wms.convert.inventorymoveJob.InventorymoveJobMainConvert;
 import com.win.module.wms.convert.inventorymoveRequest.InventorymoveRequestMainConvert;
 import com.win.module.wms.dal.dataobject.inventorymoveRecord.InventorymoveRecordDetailDO;
 import com.win.module.wms.dal.dataobject.inventorymoveRequest.InventorymoveRequestDetailDO;
@@ -52,7 +55,8 @@ public class InventorymoveRecordMainController {
 
     @Resource
     private AdminUserApi userApi;
-
+    @Resource
+    private DeptApi deptApi;
     @PostMapping("/create")
     @Operation(summary = "创建库存转移记录主")
     @PreAuthorize("@ss.hasPermission('wms:inventorymove-record-main:create')")
@@ -100,7 +104,13 @@ public class InventorymoveRecordMainController {
     @PreAuthorize("@ss.hasPermission('wms:inventorymove-record-main:query')")
     public CommonResult<PageResult<InventorymoveRecordMainRespVO>> getInventorymoveRecordMainPage(@Valid InventorymoveRecordMainPageReqVO pageVO) {
         PageResult<InventorymoveRecordMainDO> pageResult = inventorymoveRecordMainService.getInventorymoveRecordMainPage(pageVO);
-        return success(InventorymoveRecordMainConvert.INSTANCE.convertPage(pageResult));
+        PageResult<InventorymoveRecordMainRespVO> result = InventorymoveRecordMainConvert.INSTANCE.convertPage(pageResult);
+        for(InventorymoveRecordMainRespVO vo : result.getList()) {
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname());
+            vo.setDepartmentCode(deptApi.getDept(userApi.getUser(Long.valueOf(vo.getCreator())).getDeptId()).getName());
+        }
+        return success(result);
     }
     
     @PostMapping("/senior")
@@ -112,6 +122,7 @@ public class InventorymoveRecordMainController {
         for(InventorymoveRecordMainRespVO vo : result.getList()) {
             //后端创建个字段作为前端展示的虚拟字段
             vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname());
+            vo.setDepartmentCode(deptApi.getDept(userApi.getUser(Long.valueOf(vo.getCreator())).getDeptId()).getName());
         }
         return success(result);
     }
@@ -167,6 +178,7 @@ public class InventorymoveRecordMainController {
                 InventorymoveRecordMainExcelVO vo = InventorymoveRecordMainConvert.INSTANCE.convert(mainDO, detailDO);
                 vo.setCreator(userApi.getUser(Long.valueOf(mainDO.getCreator())).getNickname());
                 vo.setCreatorDetail(userApi.getUser(Long.valueOf(detailDO.getCreator())).getNickname());
+                vo.setDepartmentCode(deptApi.getDept(userApi.getUser(Long.valueOf(vo.getCreator())).getDeptId()).getName());
                 resultList.add(vo);
             }
         }