设备台账车间显示产线

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/deviceledger/DeviceLedgerServiceImpl.java

@@ -15,6 +15,7 @@ import cn.iocoder.yudao.module.iot.dal.dataobject.device.DeviceDO;
 import cn.iocoder.yudao.module.iot.service.device.DeviceService;
 import cn.iocoder.yudao.module.iot.service.device.TDengineService;
 import cn.iocoder.yudao.module.mes.controller.admin.devicecriticalcomponent.vo.DeviceCriticalComponentRespVO;
+import cn.iocoder.yudao.module.mes.controller.admin.deviceline.vo.DeviceLineListReqVO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.devicecriticalcomponent.DeviceCriticalComponentDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.devicetype.DeviceTypeDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.deviceline.DeviceLineDO;
@@ -446,13 +447,17 @@ public class DeviceLedgerServiceImpl implements DeviceLedgerService {
 
             pageReqVO.setIds(ids);
         }
-
+        List<DeviceLineDO> deviceLineList = deviceLineService.getDeviceLineList(new DeviceLineListReqVO());
+        Map<Long, List<DeviceLineDO>> collect = deviceLineList.stream().collect(Collectors.groupingBy(DeviceLineDO::getId));
         PageResult<DeviceLedgerDO> deviceLedgerDOPageResult = deviceLedgerMapper.selectPage(pageReqVO);
         for (DeviceLedgerDO deviceLedgerDO : deviceLedgerDOPageResult.getList()) {
             if (deviceLedgerDO.getDeviceType()!=null){
                 DeviceTypeDO deviceTypeDO = deviceTypeMapper.selectById(deviceLedgerDO.getDeviceType());
                 deviceLedgerDO.setTypeName(deviceTypeDO.getName());
             }
+            if(deviceLedgerDO.getDeviceLine()!=null&&CollUtil.isNotEmpty(collect.get(deviceLedgerDO.getDeviceLine().longValue()))){
+                deviceLedgerDO.setWorkshopName(collect.get(deviceLedgerDO.getDeviceLine().longValue()).get(0).getName());
+            }
         }
         return deviceLedgerDOPageResult;
     }