diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/accountcalendar/AccountcalendarController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/accountcalendar/AccountcalendarController.java index 8f262ee3..954f7285 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/accountcalendar/AccountcalendarController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/accountcalendar/AccountcalendarController.java @@ -9,7 +9,9 @@ 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.accountcalendar.vo.*; +import com.win.module.wms.controller.systemcalendar.vo.SystemcalendarRespVO; import com.win.module.wms.convert.accountcalendar.AccountcalendarConvert; +import com.win.module.wms.convert.systemcalendar.SystemcalendarConvert; import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; import com.win.module.wms.enums.DictTypeConstants; import com.win.module.wms.service.accountcalendar.AccountcalendarService; @@ -92,7 +94,13 @@ public class AccountcalendarController { @PreAuthorize("@ss.hasPermission('wms:accountcalendar:query')") public CommonResult> getAccountcalendarPage(@Valid AccountcalendarPageReqVO pageVO) { PageResult pageResult = accountcalendarService.getAccountcalendarPage(pageVO); - return success(AccountcalendarConvert.INSTANCE.convertPage(pageResult)); + PageResult result = AccountcalendarConvert.INSTANCE.convertPage(pageResult); + for(AccountcalendarRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); } @PostMapping("/senior") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/areabasic/AreabasicController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/areabasic/AreabasicController.java index 71bdf01e..dceff1d3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/areabasic/AreabasicController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/areabasic/AreabasicController.java @@ -9,7 +9,9 @@ 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.areabasic.vo.*; +import com.win.module.wms.controller.dock.vo.DockRespVO; import com.win.module.wms.convert.areabasic.AreabasicConvert; +import com.win.module.wms.convert.dock.DockConvert; import com.win.module.wms.dal.dataobject.areabasic.AreabasicDO; import com.win.module.wms.enums.DictTypeConstants; import com.win.module.wms.service.areabasic.AreabasicService; @@ -91,7 +93,13 @@ public class AreabasicController { @PreAuthorize("@ss.hasPermission('wms:areabasic:query')") public CommonResult> getAreabasicPage(@Valid AreabasicPageReqVO pageVO) { PageResult pageResult = areabasicService.getAreabasicPage(pageVO); - return success(AreabasicConvert.INSTANCE.convertPage(pageResult)); + PageResult result = AreabasicConvert.INSTANCE.convertPage(pageResult); + for(AreabasicRespVO 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/businesstype/BusinesstypeController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/businesstype/BusinesstypeController.java index 8c788472..7d57fbe4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/businesstype/BusinesstypeController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/businesstype/BusinesstypeController.java @@ -9,7 +9,9 @@ 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.businesstype.vo.*; +import com.win.module.wms.controller.transactiontype.vo.TransactiontypeRespVO; import com.win.module.wms.convert.businesstype.BusinesstypeConvert; +import com.win.module.wms.convert.transactiontype.TransactiontypeConvert; import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO; import com.win.module.wms.enums.DictTypeConstants; import com.win.module.wms.service.businesstype.BusinesstypeService; @@ -92,7 +94,13 @@ public class BusinesstypeController { @PreAuthorize("@ss.hasPermission('wms:businesstype:query')") public CommonResult> getBusinesstypePage(@Valid BusinesstypePageReqVO pageVO) { PageResult pageResult = businesstypeService.getBusinesstypePage(pageVO); - return success(BusinesstypeConvert.INSTANCE.convertPage(pageResult)); + PageResult result = BusinesstypeConvert.INSTANCE.convertPage(pageResult); + for(BusinesstypeRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); } @PostMapping("/senior") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/carrier/CarrierController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/carrier/CarrierController.java index b7b055a9..7f6c9839 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/carrier/CarrierController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/carrier/CarrierController.java @@ -11,7 +11,9 @@ import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.carrier.vo.CarrierExcelVO; import com.win.module.wms.controller.carrier.vo.CarrierRespVO; import com.win.module.wms.controller.carrier.vo.*; +import com.win.module.wms.controller.owner.vo.OwnerRespVO; import com.win.module.wms.convert.carrier.CarrierConvert; +import com.win.module.wms.convert.owner.OwnerConvert; import com.win.module.wms.dal.dataobject.carrier.CarrierDO; import com.win.module.wms.enums.DictTypeConstants; import com.win.module.wms.service.carrier.CarrierService; @@ -94,7 +96,13 @@ public class CarrierController { @PreAuthorize("@ss.hasPermission('wms:carrier:query')") public CommonResult> getCarrierPage(@Valid CarrierPageReqVO pageVO) { PageResult pageResult = carrierService.getCarrierPage(pageVO); - return success(CarrierConvert.INSTANCE.convertPage(pageResult)); + PageResult result = CarrierConvert.INSTANCE.convertPage(pageResult); + for(CarrierRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); } @PostMapping("/senior") @Operation(summary = "高级搜索获得物品基本信息分页") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/currencyexchange/CurrencyexchangeController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/currencyexchange/CurrencyexchangeController.java index afab9b7f..f5cb5bf7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/currencyexchange/CurrencyexchangeController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/currencyexchange/CurrencyexchangeController.java @@ -8,7 +8,9 @@ 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.accountcalendar.vo.AccountcalendarRespVO; import com.win.module.wms.controller.currencyexchange.vo.*; +import com.win.module.wms.convert.accountcalendar.AccountcalendarConvert; import com.win.module.wms.convert.currencyexchange.CurrencyexchangeConvert; import com.win.module.wms.dal.dataobject.currencyexchange.CurrencyexchangeDO; import com.win.module.wms.enums.DictTypeConstants; @@ -92,7 +94,13 @@ public class CurrencyexchangeController { @PreAuthorize("@ss.hasPermission('wms:currencyexchange:query')") public CommonResult> getCurrencyexchangePage(@Valid CurrencyexchangePageReqVO pageVO) { PageResult pageResult = currencyexchangeService.getCurrencyexchangePage(pageVO); - return success(CurrencyexchangeConvert.INSTANCE.convertPage(pageResult)); + PageResult result = CurrencyexchangeConvert.INSTANCE.convertPage(pageResult); + for(CurrencyexchangeRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); } @PostMapping("/senior") @Operation(summary = "高级搜索获得货币转换分页") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customer/CustomerController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customer/CustomerController.java index b061b5f6..ad7dc8ca 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customer/CustomerController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customer/CustomerController.java @@ -10,7 +10,9 @@ import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.customer.vo.CustomerImportExcelVo; import com.win.module.wms.controller.customer.vo.*; +import com.win.module.wms.controller.itempackaging.vo.ItempackagingRespVO; import com.win.module.wms.convert.customer.CustomerConvert; +import com.win.module.wms.convert.itempackaging.ItempackagingConvert; import com.win.module.wms.dal.dataobject.customer.CustomerDO; import com.win.module.wms.enums.DictTypeConstants; import com.win.module.wms.service.customer.CustomerService; @@ -92,7 +94,13 @@ public class CustomerController { @PreAuthorize("@ss.hasPermission('wms:customer:query')") public CommonResult> getCustomerPage(@Valid CustomerPageReqVO pageVO) { PageResult pageResult = customerService.getCustomerPage(pageVO); - return success(CustomerConvert.INSTANCE.convertPage(pageResult)); + PageResult result = CustomerConvert.INSTANCE.convertPage(pageResult); + for(CustomerRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); } @PostMapping("/senior") @Operation(summary = "高级搜索获得客户分页") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerdock/CustomerdockController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerdock/CustomerdockController.java index ef89f93f..32fd5169 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerdock/CustomerdockController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerdock/CustomerdockController.java @@ -8,7 +8,9 @@ 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.customer.vo.CustomerRespVO; import com.win.module.wms.controller.customerdock.vo.*; +import com.win.module.wms.convert.customer.CustomerConvert; import com.win.module.wms.convert.customerdock.CustomerdockConvert; import com.win.module.wms.dal.dataobject.customerdock.CustomerdockDO; import com.win.module.wms.enums.DictTypeConstants; @@ -92,7 +94,13 @@ public class CustomerdockController { @PreAuthorize("@ss.hasPermission('wms:customerdock:query')") public CommonResult> getCustomerdockPage(@Valid CustomerdockPageReqVO pageVO) { PageResult pageResult = customerdockService.getCustomerdockPage(pageVO); - return success(CustomerdockConvert.INSTANCE.convertPage(pageResult)); + PageResult result = CustomerdockConvert.INSTANCE.convertPage(pageResult); + for(CustomerdockRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); } @PostMapping("/senior") @Operation(summary = "高级搜索获得客户月台分页") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/CustomeritemController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/CustomeritemController.java index eddbaa70..b033056f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/CustomeritemController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/CustomeritemController.java @@ -8,7 +8,9 @@ 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.customerdock.vo.CustomerdockRespVO; import com.win.module.wms.controller.customeritem.vo.*; +import com.win.module.wms.convert.customerdock.CustomerdockConvert; import com.win.module.wms.convert.customeritem.CustomeritemConvert; import com.win.module.wms.dal.dataobject.customeritem.CustomeritemDO; import com.win.module.wms.enums.DictTypeConstants; @@ -92,7 +94,13 @@ public class CustomeritemController { @PreAuthorize("@ss.hasPermission('wms:customeritem:query')") public CommonResult> getCustomeritemPage(@Valid CustomeritemPageReqVO pageVO) { PageResult pageResult = customeritemService.getCustomeritemPage(pageVO); - return success(CustomeritemConvert.INSTANCE.convertPage(pageResult)); + PageResult result = CustomeritemConvert.INSTANCE.convertPage(pageResult); + for(CustomeritemRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); } @PostMapping("/senior") @Operation(summary = "高级搜索获得客户物品分页") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dock/DockController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dock/DockController.java index cfacc0b3..e68bdbbf 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dock/DockController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dock/DockController.java @@ -8,7 +8,9 @@ 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.dock.vo.*; +import com.win.module.wms.controller.warehouse.vo.WarehouseRespVO; import com.win.module.wms.convert.dock.DockConvert; +import com.win.module.wms.convert.warehouse.WarehouseConvert; import com.win.module.wms.dal.dataobject.dock.DockDO; import com.win.module.wms.dal.mysql.dock.DockMapper; import com.win.module.wms.enums.DictTypeConstants; @@ -93,7 +95,13 @@ public class DockController { @PreAuthorize("@ss.hasPermission('wms:dock:query')") public CommonResult> getDockPage(@Valid DockPageReqVO pageVO) { PageResult pageResult = dockService.getDockPage(pageVO); - return success(DockConvert.INSTANCE.convertPage(pageResult)); + PageResult result = DockConvert.INSTANCE.convertPage(pageResult); + for(DockRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); } @PostMapping("/senior") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/documentsetting/DocumentsettingController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/documentsetting/DocumentsettingController.java index af13eb4e..58bca75f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/documentsetting/DocumentsettingController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/documentsetting/DocumentsettingController.java @@ -8,7 +8,9 @@ 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.businesstype.vo.BusinesstypeRespVO; import com.win.module.wms.controller.documentsetting.vo.*; +import com.win.module.wms.convert.businesstype.BusinesstypeConvert; import com.win.module.wms.convert.documentsetting.DocumentsettingConvert; import com.win.module.wms.dal.dataobject.documentsetting.DocumentsettingDO; import com.win.module.wms.enums.DictTypeConstants; @@ -92,7 +94,13 @@ public class DocumentsettingController { @PreAuthorize("@ss.hasPermission('wms:documentsetting:query')") public CommonResult> getDocumentsettingPage(@Valid DocumentsettingPageReqVO pageVO) { PageResult pageResult = documentsettingService.getDocumentsettingPage(pageVO); - return success(DocumentsettingConvert.INSTANCE.convertPage(pageResult)); + PageResult result = DocumentsettingConvert.INSTANCE.convertPage(pageResult); + for(DocumentsettingRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); } @PostMapping("/senior") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/jobsetting/JobsettingController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/jobsetting/JobsettingController.java index 158e8ef8..c720511f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/jobsetting/JobsettingController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/jobsetting/JobsettingController.java @@ -9,7 +9,9 @@ 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.jobsetting.vo.*; +import com.win.module.wms.controller.requestsetting.vo.RequestsettingRespVO; import com.win.module.wms.convert.jobsetting.JobsettingConvert; +import com.win.module.wms.convert.requestsetting.RequestsettingConvert; import com.win.module.wms.dal.dataobject.jobsetting.JobsettingDO; import com.win.module.wms.enums.DictTypeConstants; import com.win.module.wms.service.jobsetting.JobsettingService; @@ -92,7 +94,13 @@ public class JobsettingController { @PreAuthorize("@ss.hasPermission('wms:jobsetting:query')") public CommonResult> getJobsettingPage(@Valid JobsettingPageReqVO pageVO) { PageResult pageResult = jobsettingService.getJobsettingPage(pageVO); - return success(JobsettingConvert.INSTANCE.convertPage(pageResult)); + PageResult result = JobsettingConvert.INSTANCE.convertPage(pageResult); + for(JobsettingRespVO 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/location/LocationController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/location/LocationController.java index 19d8e128..a35f3aa7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/location/LocationController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/location/LocationController.java @@ -10,7 +10,9 @@ 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.location.vo.*; +import com.win.module.wms.controller.locationgroup.vo.LocationgroupRespVO; import com.win.module.wms.convert.location.LocationConvert; +import com.win.module.wms.convert.locationgroup.LocationgroupConvert; import com.win.module.wms.dal.dataobject.location.LocationDO; import com.win.module.wms.dal.mysql.balance.BalanceMapper; import com.win.module.wms.dal.mysql.expectout.ExpectoutMapper; @@ -108,7 +110,13 @@ public class LocationController { @PreAuthorize("@ss.hasPermission('wms:location:query')") public CommonResult> getLocationPage(@Valid LocationPageReqVO pageVO) { PageResult pageResult = locationService.getLocationPage(pageVO); - return success(LocationConvert.INSTANCE.convertPage(pageResult)); + PageResult result = LocationConvert.INSTANCE.convertPage(pageResult); + for(LocationRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); } @PostMapping("/senior") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/locationgroup/LocationgroupController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/locationgroup/LocationgroupController.java index d9e114dd..53a2e3bf 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/locationgroup/LocationgroupController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/locationgroup/LocationgroupController.java @@ -8,7 +8,9 @@ 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.areabasic.vo.AreabasicRespVO; import com.win.module.wms.controller.locationgroup.vo.*; +import com.win.module.wms.convert.areabasic.AreabasicConvert; import com.win.module.wms.convert.locationgroup.LocationgroupConvert; import com.win.module.wms.dal.dataobject.locationgroup.LocationgroupDO; import com.win.module.wms.enums.DictTypeConstants; @@ -90,7 +92,13 @@ public class LocationgroupController { @PreAuthorize("@ss.hasPermission('wms:locationgroup:query')") public CommonResult> getLocationgroupPage(@Valid LocationgroupPageReqVO pageVO) { PageResult pageResult = locationgroupService.getLocationgroupPage(pageVO); - return success(LocationgroupConvert.INSTANCE.convertPage(pageResult)); + PageResult result = LocationgroupConvert.INSTANCE.convertPage(pageResult); + for(LocationgroupRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); } @PostMapping("/senior") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/owner/OwnerController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/owner/OwnerController.java index 012d6523..2bac73fe 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/owner/OwnerController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/owner/OwnerController.java @@ -9,7 +9,9 @@ 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.owner.vo.*; +import com.win.module.wms.controller.recordsetting.vo.RecordsettingRespVO; import com.win.module.wms.convert.owner.OwnerConvert; +import com.win.module.wms.convert.recordsetting.RecordsettingConvert; import com.win.module.wms.dal.dataobject.owner.OwnerDO; import com.win.module.wms.enums.DictTypeConstants; import com.win.module.wms.service.owner.OwnerService; @@ -92,7 +94,13 @@ public class OwnerController { @PreAuthorize("@ss.hasPermission('wms:owner:query')") public CommonResult> getOwnerPage(@Valid OwnerPageReqVO pageVO) { PageResult pageResult = ownerService.getOwnerPage(pageVO); - return success(OwnerConvert.INSTANCE.convertPage(pageResult)); + PageResult result = OwnerConvert.INSTANCE.convertPage(pageResult); + for(OwnerRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); } @PostMapping("/senior") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/process/ProcessController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/process/ProcessController.java index 7521584a..10b4a11e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/process/ProcessController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/process/ProcessController.java @@ -9,7 +9,9 @@ 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.process.vo.*; +import com.win.module.wms.controller.workstation.vo.WorkstationRespVO; import com.win.module.wms.convert.process.ProcessConvert; +import com.win.module.wms.convert.workstation.WorkstationConvert; import com.win.module.wms.dal.dataobject.process.ProcessDO; import com.win.module.wms.enums.DictTypeConstants; import com.win.module.wms.service.process.ProcessService; @@ -92,7 +94,13 @@ public class ProcessController { @PreAuthorize("@ss.hasPermission('wms:process:query')") public CommonResult> getProcessPage(@Valid ProcessPageReqVO pageVO) { PageResult pageResult = processService.getProcessPage(pageVO); - return success(ProcessConvert.INSTANCE.convertPage(pageResult)); + PageResult result = ProcessConvert.INSTANCE.convertPage(pageResult); + for(ProcessRespVO 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/productionline/ProductionlineController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionline/ProductionlineController.java index 3b13305b..d7630f7a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionline/ProductionlineController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionline/ProductionlineController.java @@ -9,7 +9,9 @@ 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.productionline.vo.*; +import com.win.module.wms.controller.workshop.vo.WorkshopRespVO; import com.win.module.wms.convert.productionline.ProductionlineConvert; +import com.win.module.wms.convert.workshop.WorkshopConvert; import com.win.module.wms.dal.dataobject.productionline.ProductionlineDO; import com.win.module.wms.enums.DictTypeConstants; import com.win.module.wms.service.productionline.ProductionlineService; @@ -91,7 +93,13 @@ public class ProductionlineController { @PreAuthorize("@ss.hasPermission('wms:productionline:query')") public CommonResult> getProductionlinePage(@Valid ProductionlinePageReqVO pageVO) { PageResult pageResult = productionlineService.getProductionlinePage(pageVO); - return success(ProductionlineConvert.INSTANCE.convertPage(pageResult)); + PageResult result = ProductionlineConvert.INSTANCE.convertPage(pageResult); + for(ProductionlineRespVO 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/project/ProjectController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/project/ProjectController.java index 05f79879..040852c7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/project/ProjectController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/project/ProjectController.java @@ -8,7 +8,9 @@ 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.customeritem.vo.CustomeritemRespVO; import com.win.module.wms.controller.project.vo.*; +import com.win.module.wms.convert.customeritem.CustomeritemConvert; import com.win.module.wms.convert.project.ProjectConvert; import com.win.module.wms.dal.dataobject.project.ProjectDO; import com.win.module.wms.enums.DictTypeConstants; @@ -103,7 +105,13 @@ public class ProjectController { @PreAuthorize("@ss.hasPermission('wms:project:query')") public CommonResult> getProjectPage(@Valid ProjectPageReqVO pageVO) { PageResult pageResult = projectService.getProjectPage(pageVO); - return success(ProjectConvert.INSTANCE.convertPage(pageResult)); + PageResult result = ProjectConvert.INSTANCE.convertPage(pageResult); + for(ProjectRespVO 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/recordsetting/RecordsettingController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/recordsetting/RecordsettingController.java index 973d7b05..4a9fa4cf 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/recordsetting/RecordsettingController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/recordsetting/RecordsettingController.java @@ -8,7 +8,9 @@ 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.jobsetting.vo.JobsettingRespVO; import com.win.module.wms.controller.recordsetting.vo.*; +import com.win.module.wms.convert.jobsetting.JobsettingConvert; import com.win.module.wms.convert.recordsetting.RecordsettingConvert; import com.win.module.wms.dal.dataobject.recordsetting.RecordsettingDO; import com.win.module.wms.enums.DictTypeConstants; @@ -103,7 +105,13 @@ public class RecordsettingController { @PreAuthorize("@ss.hasPermission('wms:recordsetting:query')") public CommonResult> getRecordsettingPage(@Valid RecordsettingPageReqVO pageVO) { PageResult pageResult = recordsettingService.getRecordsettingPage(pageVO); - return success(RecordsettingConvert.INSTANCE.convertPage(pageResult)); + PageResult result = RecordsettingConvert.INSTANCE.convertPage(pageResult); + for(RecordsettingRespVO 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/requestsetting/RequestsettingController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/requestsetting/RequestsettingController.java index c6639d2e..21b8c7ef 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/requestsetting/RequestsettingController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/requestsetting/RequestsettingController.java @@ -8,7 +8,9 @@ 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.documentsetting.vo.DocumentsettingRespVO; import com.win.module.wms.controller.requestsetting.vo.*; +import com.win.module.wms.convert.documentsetting.DocumentsettingConvert; import com.win.module.wms.convert.requestsetting.RequestsettingConvert; import com.win.module.wms.dal.dataobject.requestsetting.RequestsettingDO; import com.win.module.wms.enums.DictTypeConstants; @@ -104,7 +106,13 @@ public class RequestsettingController { @PreAuthorize("@ss.hasPermission('wms:requestsetting:query')") public CommonResult> getRequestsettingPage(@Valid RequestsettingPageReqVO pageVO) { PageResult pageResult = requestsettingService.getRequestsettingPage(pageVO); - return success(RequestsettingConvert.INSTANCE.convertPage(pageResult)); + PageResult result = RequestsettingConvert.INSTANCE.convertPage(pageResult); + for(RequestsettingRespVO 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/saleprice/SalepriceController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/SalepriceController.java index b3bfdf05..eba552c1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/SalepriceController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/SalepriceController.java @@ -8,8 +8,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.project.vo.ProjectRespVO; import com.win.module.wms.controller.saleprice.vo.*; import com.win.module.wms.controller.saleprice.vo.SalepriceImportExcelVo; +import com.win.module.wms.convert.project.ProjectConvert; import com.win.module.wms.convert.saleprice.SalepriceConvert; import com.win.module.wms.dal.dataobject.saleprice.SalepriceDO; import com.win.module.wms.enums.DictTypeConstants; @@ -93,7 +95,13 @@ public class SalepriceController { @PreAuthorize("@ss.hasPermission('wms:saleprice:query')") public CommonResult> getSalepricePage(@Valid SalepricePageReqVO pageVO) { PageResult pageResult = salepriceService.getSalepricePage(pageVO); - return success(SalepriceConvert.INSTANCE.convertPage(pageResult)); + PageResult result = SalepriceConvert.INSTANCE.convertPage(pageResult); + for(SalepriceRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); } @PostMapping("/senior") @Operation(summary = "高级搜索获得销售价格单信息分页") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/shift/ShiftController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/shift/ShiftController.java index a2b3ea2f..79ec93ab 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/shift/ShiftController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/shift/ShiftController.java @@ -8,8 +8,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.carrier.vo.CarrierRespVO; import com.win.module.wms.controller.shift.vo.*; import com.win.module.wms.controller.shift.vo.ShiftImportExcelVo; +import com.win.module.wms.convert.carrier.CarrierConvert; import com.win.module.wms.convert.shift.ShiftConvert; import com.win.module.wms.dal.dataobject.shift.ShiftDO; import com.win.module.wms.enums.DictTypeConstants; @@ -91,7 +93,13 @@ public class ShiftController { @PreAuthorize("@ss.hasPermission('wms:shift:query')") public CommonResult> getShiftPage(@Valid ShiftPageReqVO pageVO) { PageResult pageResult = shiftService.getShiftPage(pageVO); - return success(ShiftConvert.INSTANCE.convertPage(pageResult)); + PageResult result = ShiftConvert.INSTANCE.convertPage(pageResult); + for(ShiftRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); } @PostMapping("/senior") @Operation(summary = "高级搜索获得班次信息分页") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/systemcalendar/SystemcalendarController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/systemcalendar/SystemcalendarController.java index a5b0b432..274efd62 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/systemcalendar/SystemcalendarController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/systemcalendar/SystemcalendarController.java @@ -8,8 +8,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.process.vo.ProcessRespVO; import com.win.module.wms.controller.systemcalendar.vo.*; import com.win.module.wms.controller.systemcalendar.vo.SystemcalendarImportExcelVo; +import com.win.module.wms.convert.process.ProcessConvert; import com.win.module.wms.convert.systemcalendar.SystemcalendarConvert; import com.win.module.wms.dal.dataobject.systemcalendar.SystemcalendarDO; import com.win.module.wms.enums.DictTypeConstants; @@ -91,7 +93,13 @@ public class SystemcalendarController { @PreAuthorize("@ss.hasPermission('wms:systemcalendar:query')") public CommonResult> getSystemcalendarPage(@Valid SystemcalendarPageReqVO pageVO) { PageResult pageResult = systemcalendarService.getSystemcalendarPage(pageVO); - return success(SystemcalendarConvert.INSTANCE.convertPage(pageResult)); + PageResult result = SystemcalendarConvert.INSTANCE.convertPage(pageResult); + for(SystemcalendarRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); } @PostMapping("/senior") @Operation(summary = "高级搜索获得物品基本信息分页") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/team/TeamController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/team/TeamController.java index 8c75f4fb..f2804130 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/team/TeamController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/team/TeamController.java @@ -4,7 +4,9 @@ import com.win.framework.common.pojo.CustomConditions; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.shift.vo.ShiftRespVO; import com.win.module.wms.controller.team.vo.*; +import com.win.module.wms.convert.shift.ShiftConvert; import com.win.module.wms.enums.DictTypeConstants; import io.swagger.v3.oas.annotations.Parameters; import org.springframework.web.bind.annotation.*; @@ -95,7 +97,13 @@ public class TeamController { @PreAuthorize("@ss.hasPermission('wms:team:query')") public CommonResult> getTeamPage(@Valid TeamPageReqVO pageVO) { PageResult pageResult = teamService.getTeamPage(pageVO); - return success(TeamConvert.INSTANCE.convertPage(pageResult)); + PageResult result = TeamConvert.INSTANCE.convertPage(pageResult); + for(TeamRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); } @PostMapping("/senior") @Operation(summary = "高级搜索获得物品基本信息分页") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transactiontype/TransactiontypeController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transactiontype/TransactiontypeController.java index 56ba3c74..b52e7d2f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transactiontype/TransactiontypeController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transactiontype/TransactiontypeController.java @@ -107,7 +107,13 @@ public class TransactiontypeController { @PreAuthorize("@ss.hasPermission('wms:transactiontype:query')") public CommonResult> getTransactiontypePage(@Valid TransactiontypePageReqVO pageVO) { PageResult pageResult = transactiontypeService.getTransactiontypePage(pageVO); - return success(TransactiontypeConvert.INSTANCE.convertPage(pageResult)); + PageResult result = TransactiontypeConvert.INSTANCE.convertPage(pageResult); + for(TransactiontypeRespVO 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/warehouse/WarehouseController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/warehouse/WarehouseController.java index 07fbb235..013339f3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/warehouse/WarehouseController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/warehouse/WarehouseController.java @@ -9,10 +9,12 @@ 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.customer.vo.CustomerRespVO; import com.win.module.wms.controller.warehouse.vo.WarehouseImportExcelVo; import com.win.module.wms.controller.warehouse.vo.WarehouseRespVO; import com.win.module.wms.controller.warehouse.vo.*; +import com.win.module.wms.convert.customer.CustomerConvert; import com.win.module.wms.convert.warehouse.WarehouseConvert; import com.win.module.wms.dal.dataobject.warehouse.WarehouseDO; import com.win.module.wms.dal.mysql.warehouse.WarehouseMapper; @@ -97,7 +99,13 @@ public class WarehouseController { @PreAuthorize("@ss.hasPermission('wms:warehouse:query')") public CommonResult> getWarehousePage(@Valid WarehousePageReqVO pageVO) { PageResult pageResult = warehouseService.getWarehousePage(pageVO); - return success(WarehouseConvert.INSTANCE.convertPage(pageResult)); + PageResult result = WarehouseConvert.INSTANCE.convertPage(pageResult); + for(WarehouseRespVO 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/workshop/WorkshopController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/workshop/WorkshopController.java index 529b3e66..d2aeab62 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/workshop/WorkshopController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/workshop/WorkshopController.java @@ -8,8 +8,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.location.vo.LocationRespVO; import com.win.module.wms.controller.workshop.vo.WorkshopRespVO; import com.win.module.wms.controller.workshop.vo.*; +import com.win.module.wms.convert.location.LocationConvert; import com.win.module.wms.convert.workshop.WorkshopConvert; import com.win.module.wms.convert.workshop.WorkshopConvert; import com.win.module.wms.dal.dataobject.workshop.WorkshopDO; @@ -95,7 +97,13 @@ public class WorkshopController { @PreAuthorize("@ss.hasPermission('wms:workshop:query')") public CommonResult> getWorkshopPage(@Valid WorkshopPageReqVO pageVO) { PageResult pageResult = workshopService.getWorkshopPage(pageVO); - return success(WorkshopConvert.INSTANCE.convertPage(pageResult)); + PageResult result = WorkshopConvert.INSTANCE.convertPage(pageResult); + for(WorkshopRespVO 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/workstation/WorkstationController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/workstation/WorkstationController.java index f95a53bb..076d5d31 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/workstation/WorkstationController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/workstation/WorkstationController.java @@ -8,8 +8,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.productionline.vo.ProductionlineRespVO; import com.win.module.wms.controller.workstation.vo.WorkstationRespVO; import com.win.module.wms.controller.workstation.vo.*; +import com.win.module.wms.convert.productionline.ProductionlineConvert; import com.win.module.wms.convert.workstation.WorkstationConvert;; import com.win.module.wms.dal.dataobject.workstation.WorkstationDO; import com.win.module.wms.enums.DictTypeConstants; @@ -91,7 +93,13 @@ public class WorkstationController { @PreAuthorize("@ss.hasPermission('wms:workstation:query')") public CommonResult> getWorkstationPage(@Valid WorkstationPageReqVO pageVO) { PageResult pageResult = workstationService.getWorkstationPage(pageVO); - return success(WorkstationConvert.INSTANCE.convertPage(pageResult)); + PageResult result = WorkstationConvert.INSTANCE.convertPage(pageResult); + for(WorkstationRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); } @PostMapping("/senior") @Operation(summary = "高级搜索获得工位信息分页")