From caa2b51bb4133f5a2e59eac242e744fb57f864a0 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 10 九月 2024 13:01:44 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java
index f245d7b..24c8ea8 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java
@@ -7,6 +7,7 @@
import com.ruoyi.chargingPile.api.model.Site;
import com.ruoyi.common.core.utils.WebUtils;
import com.ruoyi.common.core.web.page.PageInfo;
+import com.ruoyi.order.api.model.ExportUidDto;
import com.ruoyi.order.api.feignClient.OrderClient;
import com.ruoyi.order.api.model.TChargingOrder;
import com.ruoyi.order.api.model.TSettlementConfirm;
@@ -247,11 +248,11 @@
}
@ApiOperation(value = "下载-已出账", tags = {"管理后台-充电算账单"})
- @GetMapping("/downloadBill")
- public R downloadBill(String uid,HttpServletResponse response)
+ @PutMapping("/downloadBill")
+ public R downloadBill(@RequestBody ExportUidDto uid, HttpServletResponse response)
{
ChargingListQuery chargingListQuery = new ChargingListQuery();
- chargingListQuery.setUid(uid);
+ chargingListQuery.setUid(uid.getUid());
chargingListQuery.setPageCurr(1);
chargingListQuery.setPageSize(99999);
ChargingBillVO data = chargingOrderClient.chargingBillListR(chargingListQuery).getData();
@@ -321,10 +322,12 @@
}
@ApiOperation(value = "导出", tags = {"管理后台-结算汇总表"})
- @GetMapping("/downloadSettlementTotal")
- public R downloadSettlementTotal(String time,HttpServletResponse response)
+ @PutMapping("/downloadSettlementTotal")
+ public R downloadSettlementTotal(@RequestBody ExportUidDto uid,HttpServletResponse response)
{
- SettlementTotalVO data = chargingOrderClient.settlementTotalR(time).getData();
+ SettlementTotalVO data = chargingOrderClient.settlementTotalR(uid.getTime()).getData();
+
+
try {
response.setCharacterEncoding(Constants.UTF8);
response.setContentType("application/vnd.ms-excel");
@@ -354,10 +357,10 @@
return R.ok();
}
@ApiOperation(value = "下载", tags = {"管理后台-结算表记录"})
- @GetMapping("/downloadSettlement")
- public R downloadSettlement(String uid,HttpServletResponse response)
+ @PutMapping("/downloadSettlement")
+ public R downloadSettlement(@RequestBody ExportUidDto uid,HttpServletResponse response)
{
- TSettlementConfirm data = chargingOrderClient.downloadSettlement(uid).getData();
+ TSettlementConfirm data = chargingOrderClient.downloadSettlement(uid.getUid()).getData();
List<Site> data1 = siteClient.getSiteByIds(Arrays.asList(data.getSiteId())).getData();
if (!data1.isEmpty()){
data.setSiteName(data1.get(0).getName());
@@ -406,7 +409,7 @@
@ApiOperation(value = "下载-未出账", tags = {"管理后台-充电算账单"})
- @GetMapping("/download")
+ @PutMapping("/download")
public R download(String uid,HttpServletResponse response)
{
ChargingListQuery chargingListQuery = new ChargingListQuery();
--
Gitblit v1.7.1