diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/deviceledger/DeviceLedgerController.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/deviceledger/DeviceLedgerController.java index 02486eab53..104a6ad691 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/deviceledger/DeviceLedgerController.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/deviceledger/DeviceLedgerController.java @@ -86,7 +86,24 @@ public class DeviceLedgerController { @PreAuthorize("@ss.hasPermission('mes:device-ledger:query')") public CommonResult getDeviceLedger(@RequestParam("id") Long id) { DeviceLedgerDO deviceLedger = deviceLedgerService.getDeviceLedger(id); - return success(BeanUtils.toBean(deviceLedger, DeviceLedgerRespVO.class)); + + DeviceLedgerRespVO respVO = BeanUtils.toBean(deviceLedger, DeviceLedgerRespVO.class); + + if (StringUtils.isNotBlank(respVO.getDeviceManager())) { + String[] userIds = respVO.getDeviceManager().split(","); + StringBuilder names = new StringBuilder(); + + for (int i = 0; i < userIds.length; i++) { + AdminUserRespDTO user = adminUserApi.getUser(Long.valueOf(userIds[i].trim())); + if (user != null) { + if (i > 0) names.append(", "); + names.append("(").append(user.getUsername()).append(")").append(user.getNickname()); + } + } + respVO.setDeviceManagerName(names.toString()); + } + + return success(respVO); } diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/deviceledger/DeviceLedgerServiceImpl.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/deviceledger/DeviceLedgerServiceImpl.java index db1e3b3c43..b8042213bd 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/deviceledger/DeviceLedgerServiceImpl.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/deviceledger/DeviceLedgerServiceImpl.java @@ -140,6 +140,8 @@ public class DeviceLedgerServiceImpl implements DeviceLedgerService { public DeviceLedgerDO getDeviceLedger(Long id) { DeviceLedgerDO deviceLedgerDO = deviceLedgerMapper.selectById(id); + + Map> dvRepairDOMap=new HashMap<>(); //TODO 待修改迁移