From 7baebae1998087fcdaba8e0762213fdeac96d1da Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Fri, 1 Dec 2023 15:25:14 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=A8=98=E9=8C=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PurchasereceiptRecordDetailController.java | 2 +- .../PurchasereceiptRecordMainController.java | 7 ++++++- .../PurchasereceiptRequestDetailController.java | 1 - 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/PurchasereceiptRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/PurchasereceiptRecordDetailController.java index f39bab2f..926d7494 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/PurchasereceiptRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/PurchasereceiptRecordDetailController.java @@ -64,7 +64,7 @@ public class PurchasereceiptRecordDetailController { } @GetMapping("/list") - @Operation(summary = "高级搜索获得采购收货记录子信息分页") + @Operation(summary = "高级搜索获得采购收货记录子信息") @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-record-detail:query')") public CommonResult> getPurchasereceiptRecordDetailList(@RequestParam Long masterId) { List list = purchasereceiptRecordDetailService.selectList(masterId); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/PurchasereceiptRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/PurchasereceiptRecordMainController.java index 8c19ca68..989233a8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/PurchasereceiptRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/PurchasereceiptRecordMainController.java @@ -69,7 +69,12 @@ public class PurchasereceiptRecordMainController { @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-record-main:query')") public CommonResult> getPurchasereceiptRecordMainPage(@Valid PurchasereceiptRecordMainPageReqVO pageVO) { PageResult pageResult = purchasereceiptRecordMainService.getPurchasereceiptRecordMainPage(pageVO); - return success(PurchasereceiptRecordMainConvert.INSTANCE.convertPage(pageResult)); + PageResult result = PurchasereceiptRecordMainConvert.INSTANCE.convertPage(pageResult); + for(PurchasereceiptRecordMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + vo.setCreator(user.getNickname()); + } + return success(result); } @GetMapping("/export-excel") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestDetailController.java index 7ec46a74..836b9280 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestDetailController.java @@ -78,7 +78,6 @@ public class PurchasereceiptRequestDetailController { PageResult result = PurchasereceiptRequestDetailConvert.INSTANCE.convertPage(pageResult); for (PurchasereceiptRequestDetailRespVO vo : result.getList()) { AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); - //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); AdminUserRespDTO userUpdater = userApi.getUser(Long.valueOf(vo.getUpdater())); vo.setUpdater(userUpdater.getNickname());