merge

luodangjia

2024-11-04 8e52b4f7d125f715c4cec639a88fee42c47bad22

merge

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java

@@ -1281,11 +1281,13 @@
            brands.add(objectMap.get("vehicle_brand").toString());
        }

        if (carBrandMap.size()>=5) {
        Long count = chargingOrderService.countCar(brands);
        Map<String, Object> others = new HashMap<>();
        others.put("vehicle_brand","其他");
        others.put("counts",count);
        carBrandMap.add(others);
        }
        //本地车数量
        Map<String,Object> localCarMap = chargingOrderService.countLocalCar();


 ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml

@@ -1549,9 +1549,13 @@
        select count(1)
        from
            charging_pile_account.t_app_user_car
        where del_flag = 0 and vehicle_brand  not in
        where del_flag = 0

        <if test="brands != null and brands.size() > 0">
          and vehicle_brand  not in
        <foreach collection="brands" item="brand" open="(" separator="," close=")">
            #{brand}
        </foreach>
        </if>
    </select>
</mapper>