明星电力充电桩
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
无关风月
昨天 f7767066879bf66e7bb3ba80e0240bc9664f2f01 
 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);


    }