大屏

huliguo

2 天以前 8115295a64e0809246897fefb8c45de06dce0799

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderAccountingStrategyServiceImpl.java

@@ -52,8 +52,11 @@
      List<TChargingOrder> list = chargingOrderService.list(new LambdaQueryWrapper<TChargingOrder>().in(TChargingOrder::getSiteId, siteIds).eq(TChargingOrder::getStatus, 5)
            .eq(TChargingOrder::getDelFlag, 0).last(" and start_time between '" + startTime + "' and DATE_FORMAT(now(), '%Y-%m-%d %H:%i:%s')"));
      List<Long> orderId = list.stream().map(TChargingOrder::getId).collect(Collectors.toList());
      List<TChargingOrderAccountingStrategy> list1 = this.list(new LambdaQueryWrapper<TChargingOrderAccountingStrategy>().in(TChargingOrderAccountingStrategy::getChargingOrderId, orderId));
		
      List<TChargingOrderAccountingStrategy> list1 = new ArrayList<>();
      if(orderId.size() > 0){
         list1 = this.list(new LambdaQueryWrapper<TChargingOrderAccountingStrategy>().in(TChargingOrderAccountingStrategy::getChargingOrderId, orderId));
      }

      List<List<Map<String, Object>>> list2 = new ArrayList<>();
      for (int i = days; i >= 0; i--) {
         Calendar nowDateTime = Calendar.getInstance();