xuhy
10 天以前 23c4778b11ff301b1a75812b35dc803fc38ef84c
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
@@ -270,6 +270,7 @@
      TChargingOrder chargingOrder = this.getById(id);
      MyChargingOrderInfo myChargingOrderInfo = new MyChargingOrderInfo();
      myChargingOrderInfo.setId(id);
      myChargingOrderInfo.setChargingGunId(chargingOrder.getChargingGunId());
      myChargingOrderInfo.setCode(chargingOrder.getCode());
      myChargingOrderInfo.setCreateTime(chargingOrder.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
      myChargingOrderInfo.setStatus(chargingOrder.getStatus());
@@ -4097,7 +4098,8 @@
      LocalDateTime endDate = today.minusDays(1).atTime(LocalTime.MAX);
      // 查询数据库
      List<OrderCountByDate> orderCounts = this.baseMapper.countOrdersByDate(startDate, endDate, gunIds);*/
      // 转换结果
      List<LocalDate> dates = new ArrayList<>();
      List<Integer> counts = new ArrayList<>();
      LocalDate today = LocalDate.now();
@@ -4113,7 +4115,7 @@
                  .eq(TChargingOrder::getDelFlag,0)//未删除
                  .in(TChargingOrder::getStatus,Arrays.asList(3,5))//充电中、已结束
                  .in(TChargingOrder::getChargingGunId,gunIds)//符合条件的充电枪 站点 超充快充
                  .between(BasePojo::getCreateTime,startOfDay,endOfDay));//每天
                  .between(TChargingOrder::getCreateTime,startOfDay,endOfDay));//每天
         }
         dates.add(day);
         counts.add(count.intValue());
@@ -4122,7 +4124,6 @@
      vo.setCounts(counts);
      return R.ok(vo);
   }
   @Override
   public BigDecimal getSumDegreeBySiteIds(List<Integer> siteIds) {