合并代码

puzhibing

2024-11-11 404c34cdcb58df5aab92fb29da5bc7d198a8f5d8

 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);