diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobDetailController.java index 7bcbd436..0f9e66b2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobDetailController.java @@ -7,8 +7,11 @@ import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.purchasereceiptJob.vo.PurchasereceiptJobDetailPageReqVO; import com.win.module.wms.controller.purchasereceiptJob.vo.PurchasereceiptJobDetailRespVO; +import com.win.module.wms.controller.purchasereceiptRequest.vo.PurchasereceiptRequestDetailRespVO; import com.win.module.wms.convert.purchasereceiptJob.PurchasereceiptJobDetailConvert; +import com.win.module.wms.convert.purchasereceiptRequest.PurchasereceiptRequestDetailConvert; import com.win.module.wms.dal.dataobject.purchasereceiptJob.PurchasereceiptJobDetailDO; +import com.win.module.wms.dal.dataobject.purchasereceiptRequest.PurchasereceiptRequestDetailDO; import com.win.module.wms.service.purchasereceiptJob.PurchasereceiptJobDetailService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -41,7 +44,6 @@ public class PurchasereceiptJobDetailController { PageResult result = PurchasereceiptJobDetailConvert.INSTANCE.convertPage(pageResult); for(PurchasereceiptJobDetailRespVO vo : result.getList()) { AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); - //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); } return success(result); @@ -52,7 +54,12 @@ public class PurchasereceiptJobDetailController { @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-detail:query')") public CommonResult> getPurchasereceiptJobDetailPage(@Valid PurchasereceiptJobDetailPageReqVO pageVO) { PageResult pageResult = purchasereceiptJobDetailService.getPurchasereceiptJobDetailPage(pageVO); - return success(PurchasereceiptJobDetailConvert.INSTANCE.convertPage(pageResult)); + PageResult result = PurchasereceiptJobDetailConvert.INSTANCE.convertPage(pageResult); + for(PurchasereceiptJobDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + vo.setCreator(user.getNickname()); + } + return success(result); } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobMainController.java index 1dfcb947..ce900eb1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobMainController.java @@ -60,8 +60,9 @@ public class PurchasereceiptJobMainController { PageResult pageResult1 = PurchasereceiptJobMainConvert.INSTANCE.convertPage(pageResult); for (PurchasereceiptJobMainRespVO vo : pageResult1.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()); } return success(pageResult1); } @@ -74,8 +75,9 @@ public class PurchasereceiptJobMainController { PageResult result = PurchasereceiptJobMainConvert.INSTANCE.convertPage(pageResult); for (PurchasereceiptJobMainRespVO 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()); } return success(result); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobMainBaseVO.java index 49c5d1d8..d9c08378 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobMainBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobMainBaseVO.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.purchasereceiptJob.vo; +import com.baomidou.mybatisplus.annotation.FieldStrategy; +import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; @@ -88,6 +90,9 @@ public class PurchasereceiptJobMainBaseVO { @Schema(description = "承接人用户ID") private String acceptUserId; + @Schema(description = "承接人用户名") + private String acceptUserName; + @Schema(description = "承接时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime acceptTime; @@ -95,6 +100,9 @@ public class PurchasereceiptJobMainBaseVO { @Schema(description = "完成人用户ID") private String completeUserId; + @Schema(description = "完成人用户名") + private String completeUserName; + @Schema(description = "完成时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime completeTime; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobMainExcelVO.java index 6151ceda..5b966c4e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobMainExcelVO.java @@ -1,6 +1,8 @@ package com.win.module.wms.controller.purchasereceiptJob.vo; import com.alibaba.excel.annotation.ExcelProperty; +import com.baomidou.mybatisplus.annotation.FieldStrategy; +import com.baomidou.mybatisplus.annotation.TableField; import com.win.framework.excel.core.annotations.DictFormat; import com.win.framework.excel.core.convert.DictConvert; import com.win.module.wms.enums.DictTypeConstants; @@ -74,14 +76,15 @@ public class PurchasereceiptJobMainExcelVO { @ExcelProperty("岗位") private String userPositionCode; - @ExcelProperty("承接人用户ID") - private String acceptUserId; + @ExcelProperty("承接人用户名") + private String acceptUserName; @ExcelProperty("承接时间") private LocalDateTime acceptTime; - @ExcelProperty("完成人用户ID") - private String completeUserId; + + @ExcelProperty("完成人用户名") + private String completeUserName; @ExcelProperty("完成时间") private LocalDateTime completeTime; 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 d66fced2..7ec46a74 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 @@ -5,6 +5,7 @@ import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.purchasereceiptJob.vo.PurchasereceiptJobMainRespVO; import com.win.module.wms.controller.purchasereceiptRequest.vo.PurchasereceiptRequestDetailCreateReqVO; import com.win.module.wms.controller.purchasereceiptRequest.vo.PurchasereceiptRequestDetailPageReqVO; import com.win.module.wms.controller.purchasereceiptRequest.vo.PurchasereceiptRequestDetailRespVO; @@ -74,7 +75,15 @@ public class PurchasereceiptRequestDetailController { @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-request-detail:query')") public CommonResult> getPurchasereceiptRequestDetailPage(@Valid PurchasereceiptRequestDetailPageReqVO pageVO) { PageResult pageResult = purchasereceiptRequestDetailService.getPurchasereceiptRequestDetailPage(pageVO); - return success(PurchasereceiptRequestDetailConvert.INSTANCE.convertPage(pageResult)); + 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()); + } + return success(result); } @PostMapping("/senior") @@ -83,10 +92,12 @@ public class PurchasereceiptRequestDetailController { public CommonResult> getPurchasereceiptRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = purchasereceiptRequestDetailService.getPurchasereceiptRequestDetailSenior(conditions); PageResult result = PurchasereceiptRequestDetailConvert.INSTANCE.convertPage(pageResult); - for(PurchasereceiptRequestDetailRespVO vo : result.getList()) { + 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()); } return success(result); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestMainController.java index adf57a06..aa6606ec 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestMainController.java @@ -9,7 +9,10 @@ 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.ItembasicExcelVO; +import com.win.module.wms.controller.itembasic.vo.ItembasicRespVO; import com.win.module.wms.controller.purchasereceiptRequest.vo.*; +import com.win.module.wms.convert.itembasic.ItembasicConvert; import com.win.module.wms.convert.purchasereceiptRequest.PurchasereceiptRequestMainConvert; import com.win.module.wms.dal.dataobject.purchasereceiptRequest.PurchasereceiptRequestDetailDO; import com.win.module.wms.dal.dataobject.purchasereceiptRequest.PurchasereceiptRequestMainDO; @@ -74,8 +77,9 @@ public class PurchasereceiptRequestMainController { PageResult result = PurchasereceiptRequestMainConvert.INSTANCE.convertPage(pageResult); for(PurchasereceiptRequestMainRespVO 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()); } return success(result); } @@ -103,7 +107,14 @@ public class PurchasereceiptRequestMainController { @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-request-main:query')") public CommonResult> getPurchasereceiptRequestMainPage(@Valid PurchasereceiptRequestMainPageReqVO pageVO) { PageResult pageResult = purchasereceiptRequestMainService.getPurchasereceiptRequestMainPage(pageVO); - return success(PurchasereceiptRequestMainConvert.INSTANCE.convertPage(pageResult)); + PageResult result = PurchasereceiptRequestMainConvert.INSTANCE.convertPage(pageResult); + for(PurchasereceiptRequestMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + vo.setCreator(user.getNickname()); + AdminUserRespDTO userUpdate = userApi.getUser(Long.valueOf(vo.getUpdater())); + vo.setUpdater(userUpdate.getNickname()); + } + return success(result); } @GetMapping("/export-excel") @@ -154,7 +165,9 @@ public class PurchasereceiptRequestMainController { for(PurchasereceiptRequestDetailDO detailDO : subList) { PurchasereceiptRequestMainExcelVO vo = PurchasereceiptRequestMainConvert.INSTANCE.convert(mainDO, detailDO); AdminUserRespDTO user = userApi.getUser(Long.valueOf(mainDO.getCreator())); + AdminUserRespDTO userUpdate = userApi.getUser(Long.valueOf(mainDO.getUpdater())); vo.setCreator(user.getNickname()); + vo.setUpdater(userUpdate.getNickname()); resultList.add(vo); } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/vo/PurchasereceiptRequestMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/vo/PurchasereceiptRequestMainExcelVO.java index 99943a49..bc3ac156 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/vo/PurchasereceiptRequestMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/vo/PurchasereceiptRequestMainExcelVO.java @@ -1,6 +1,7 @@ package com.win.module.wms.controller.purchasereceiptRequest.vo; import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.win.framework.excel.core.annotations.DictFormat; import com.win.framework.excel.core.convert.DictConvert; import com.win.module.wms.enums.DictTypeConstants; @@ -177,12 +178,14 @@ public class PurchasereceiptRequestMainExcelVO { private String toOwnerCode; @ExcelProperty("最后更新时间") + @ColumnWidth(value = 20) private LocalDateTime updateTime; @ExcelProperty("最后更新者用户名") private String updater; @ExcelProperty("创建时间") + @ColumnWidth(value = 20) private LocalDateTime createTime; @ExcelProperty("创建者用户名")