bug修改

puzhibing

2024-10-26 9e53aeae10824c14e9c4329e30b32f205adbe203

bug修改

 ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/PageChargingOrderAndUploadRealTimeMonitoringDataDto.java

@@ -17,7 +17,7 @@
public class PageChargingOrderAndUploadRealTimeMonitoringDataDto extends BaseModel {

    private List<ChargingOrderAndUploadRealTimeMonitoringDataDto> records;
    private Long count;
    private Long total;


}

 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TParkingRecordServiceImpl.java

@@ -59,7 +59,9 @@
                        .eq(TParkingLot::getSiteId, site.getId()));
                List<Integer> lotIds = tParkingLots.stream().map(TParkingLot::getId).collect(Collectors.toList());
                if(CollectionUtils.isEmpty(lotIds)){
                    return new TParkingRecordPageInfoVO();
                    TParkingRecordPageInfoVO tParkingRecordPageInfoVO = new TParkingRecordPageInfoVO();
                    tParkingRecordPageInfoVO.setParkingRecordVOS(new PageInfo<TParkingRecordVO>());
                    return tParkingRecordPageInfoVO;
                }
                query.setLotIds(lotIds);
            }

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

@@ -833,7 +833,7 @@
        }

        PageChargingOrderAndUploadRealTimeMonitoringDataDto page = new PageChargingOrderAndUploadRealTimeMonitoringDataDto();
        page.setCount(data1.getCount());
        page.setTotal(data1.getCount());
        page.setRecords(dtos);

        return R.ok(page);