bug修改

puzhibing

2024-10-26 a41a64cab7a8c05c65f4b92fef82acf805d1d9b2

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java

@@ -804,7 +804,7 @@
//        }
//        Set<String> strings = map.keySet();


        mongoChargingOrderQuery.setPageSize(10);
        List<UploadRealTimeMonitoringData> data1 = uploadRealTimeMonitoringDataClient.getAll(mongoChargingOrderQuery).getData();

        List<ChargingOrderAndUploadRealTimeMonitoringDataDto> dtos = new ArrayList<>();
@@ -820,13 +820,17 @@
                    BeanUtils.copyProperties(chargingOrderVO, dataDto);
                }
                BeanUtils.copyProperties(uploadRealTimeMonitoringData,dataDto);

                dataDto.setStartTime(uploadRealTimeMonitoringData.getStartTime());
                dataDto.setEndTime(uploadRealTimeMonitoringData.getEndTime()==null?null:uploadRealTimeMonitoringData.getEndTime());
                dataDto.setStatus(chargingOrderVO.getStatus());
                dtos.add(dataDto);
            }else {
                continue;
            }
        }

        for (int i = 0; i < dtos.size(); i++) {
            dtos.get(i).setIndex(i);
        }

        return R.ok(dtos);
    }