ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingPileController.java
@@ -244,6 +244,7 @@ public void updateChargingPileStatus(@RequestBody UpdateChargingPileStatusVo vo){ String pile_code = vo.getPile_code(); String gun_code = vo.getGun_code(); //0：正常，1：故障，2=插枪 Integer status = vo.getStatus(); Map<String, Object> charging_pile_online = redisService.getCacheMap("charging_gun_online"); Long time = (Long) charging_pile_online.get(pile_code + gun_code); ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
@@ -1276,7 +1276,6 @@ start = statisticsQueryDto.getStartTime(); end = statisticsQueryDto.getEndTime(); }else if (statisticsQueryDto.getDayType()==5){ // 获取今年1月1日的日期 start = statisticsQueryDto.getStartTime(); end = statisticsQueryDto.getEndTime(); if (start.equals(end)){ ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml
@@ -439,7 +439,7 @@ FROM t_charging_order_accounting_strategy t1 LEFT JOIN t_charging_order t2 on t1.charging_order_id = t2.id where t2.create_time between #{start} and #{end} where t2.del_flag = 0 and t2.status = 5 and t2.recharge_payment_status = 2 and t2.create_time between #{start} and #{end} <if test="null != siteIds and siteIds.size() > 0"> and t2.site_id in <foreach collection="siteIds" separator="," open="(" close=")" item="item" index="index"> @@ -987,7 +987,7 @@ and t1.site_id = #{req.siteId} </if> <if test="startTime1 != null and startTime1!=''"> and (t1.pay_time between #{startTime1} and #{startTime2}) and (t1.create_time between #{startTime1} and #{startTime2}) </if> <if test="endTime1 != null and endTime1!=''"> and (t1.end_time between #{endTime1} and #{endTime2})
