From a0070809b2344266608de9f8c9ac5c8ce1c31a8c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 16 七月 2025 20:59:55 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile into dev
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/GovernmentCloudChargingPileController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/GovernmentCloudChargingPileController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/GovernmentCloudChargingPileController.java
index 7688348..eef31a6 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/GovernmentCloudChargingPileController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/GovernmentCloudChargingPileController.java
@@ -114,14 +114,14 @@
List<TParkingRecord> list13 = parkingRecordService.lambdaQuery()
.ge(TParkingRecord::getCreateTime,start)
.le(TParkingRecord::getCreateTime,end) .list();
-// List<TPartnerSite> list14 = invoiceInformationService.lambdaQuery().between(TPartnerSite::getCreateTime, start, end).list();
+ List<TPartnerSite> list14 = partnerSiteService.list();
List<TRepair> list15 = repairService.lambdaQuery()
.ge(TRepair::getCreateTime,start)
.le(TRepair::getCreateTime,end) .list();
List<TVehicleRamp> list16 = vehicleRampService.lambdaQuery()
.ge(TVehicleRamp::getCreateTime,start)
.le(TVehicleRamp::getCreateTime,end) .list();
-// List<TSiteMenu> list17 = siteMenuService.lambdaQuery().between(TSiteMenu::getCreateTime, start, end).list();
+ List<TSiteMenu> list17 = siteMenuService.lambdaQuery().between(TSiteMenu::getCreateTime, start, end).list();
governmentCloudAccountVO.setPartners(list1);
governmentCloudAccountVO.setSites(list2);
@@ -136,10 +136,10 @@
governmentCloudAccountVO.setMonitoringEquipments(list11);
governmentCloudAccountVO.setParkingLots(list12);
governmentCloudAccountVO.setParkingRecords(list13);
-// governmentCloudAccountVO.setPartnerSites(list14);
+ governmentCloudAccountVO.setPartnerSites(list14);
governmentCloudAccountVO.setRepairs(list15);
governmentCloudAccountVO.setVehicleRamps(list16);
-// governmentCloudAccountVO.setSiteMenus(list17);
+ governmentCloudAccountVO.setSiteMenus(list17);
return R.ok(governmentCloudAccountVO);
}
--
Gitblit v1.7.1