Merge remote-tracking branch 'origin/master'

luodangjia

2024-11-01 950232e31e984c1c5e6b94efd6a1440f1d6fecc2

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

@@ -34,7 +34,7 @@
    * @return
    */
   @ResponseBody
   @GetMapping("/getTotalElectricQuantity/{days}")
   @PostMapping("/getTotalElectricQuantity/{days}")
   public R<List<List<Map<String, Object>>>> getTotalElectricQuantity(@PathVariable Integer days, @RequestParam("siteIds") Set<Integer> siteIds){
      List<List<Map<String, Object>>> list = chargingOrderAccountingStrategyService.getTotalElectricQuantity(days, siteIds);
      return R.ok(list);
@@ -47,7 +47,7 @@
    * @return
    */
   @ResponseBody
   @GetMapping("/getDailyChargingDegree/{days}")
   @PostMapping("/getDailyChargingDegree/{days}")
   public R<List<Double>> getDailyChargingDegree(@PathVariable Integer days, @RequestParam("siteIds") Set<Integer> siteIds){
      List<Double> list = chargingOrderAccountingStrategyService.getDailyChargingDegree(days, siteIds);
      return R.ok(list);