From 26e98ccf5ba180c7ed96e8a106b8c510da1c741a Mon Sep 17 00:00:00 2001 From: chenfang Date: Mon, 18 Dec 2023 08:41:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E4=BF=AE=E6=94=B9=E7=94=B3?= =?UTF-8?q?=E8=AF=B7/=E8=AE=B0=E5=BD=95=20=20=E5=89=8D=E7=AB=AF=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E5=88=9B=E5=BB=BA=E8=80=85=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InventorymoveJobMainController.java | 17 ++++++++++++++--- .../InventorymoveRecordMainController.java | 16 ++++++++++++++-- 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/InventorymoveJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/InventorymoveJobMainController.java index 7ae4fb92..5f604aa5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/InventorymoveJobMainController.java +++ b/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> getInventorymoveJobMainPage(@Valid InventorymoveJobMainPageReqVO pageVO) { PageResult pageResult = inventorymoveJobMainService.getInventorymoveJobMainPage(pageVO); - return success(InventorymoveJobMainConvert.INSTANCE.convertPage(pageResult)); + PageResult 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); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/InventorymoveRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/InventorymoveRecordMainController.java index c62e655e..5fa1a8a7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/InventorymoveRecordMainController.java +++ b/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> getInventorymoveRecordMainPage(@Valid InventorymoveRecordMainPageReqVO pageVO) { PageResult pageResult = inventorymoveRecordMainService.getInventorymoveRecordMainPage(pageVO); - return success(InventorymoveRecordMainConvert.INSTANCE.convertPage(pageResult)); + PageResult 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); } }