From 6ddfb0ce8f781457b59689d08218d2ea617c5925 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期四, 05 九月 2024 10:02:43 +0800
Subject: [PATCH] 完善功能

---
 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyDetailController.java |   25 +++++++++++++------------
 1 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyDetailController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyDetailController.java
index 09c646a..100cca8 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyDetailController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyDetailController.java
@@ -84,18 +84,7 @@
     }
     
     
-    /**
-     * 获取当前有效的计费模板
-     * @param accountingStrategyId
-     * @return
-     */
-    @PostMapping("/getNowData")
-    public R<TAccountingStrategyDetail> getNowData(@RequestParam("accountingStrategyId") Integer accountingStrategyId){
-        TAccountingStrategyDetail one = accountingStrategyDetailService.getOne(new LambdaQueryWrapper<TAccountingStrategyDetail>()
-                .eq(TAccountingStrategyDetail::getAccountingStrategyId, accountingStrategyId)
-                .last(" and DATE_FORMAT(now(), '%H:%i') between start_time and end_time"));
-        return R.ok(one);
-    }
+   
 
     /**
      * 通过站点id查询当前时段使用的策略明细
@@ -153,5 +142,17 @@
                 .last(" and DATE_FORMAT(now(), '%H:%i') between start_time and end_time"));
         return R.ok(dto.getStrategyDetailId().equals(one.getId()));
     }
+    
+    
+    /**
+     * 根据计费策略主表id策略明细
+     * @param id
+     * @return
+     */
+    @PostMapping("/getListByAccountingStrategyId")
+    public R<List<TAccountingStrategyDetail>> getListByAccountingStrategyId(@RequestParam("id") Integer id){
+        List<TAccountingStrategyDetail> list = accountingStrategyDetailService.list(new LambdaQueryWrapper<TAccountingStrategyDetail>().eq(TAccountingStrategyDetail::getAccountingStrategyId, id));
+        return R.ok(list);
+    }
 }
 

--
Gitblit v1.7.1