From ce3b68cce4b030e222448044adf7325d0c897376 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 13 二月 2025 14:02:00 +0800
Subject: [PATCH] 优化功能
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java | 6 +++++-
1 files changed, 5 insertions(+), 1 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 3e96f1b..b2a508f 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
@@ -14,6 +14,7 @@
import com.ruoyi.common.core.utils.WebUtils;
import com.ruoyi.common.core.web.domain.BasePojo;
import com.ruoyi.common.core.web.page.PageInfo;
+import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.common.security.annotation.Logical;
import com.ruoyi.common.security.annotation.RequiresPermissions;
import com.ruoyi.integration.api.feignClient.UploadRealTimeMonitoringDataClient;
@@ -387,7 +388,8 @@
@Log(title = "【结算汇总表】下载汇总表", businessType = BusinessType.EXPORT)
public R downloadSettlementTotal(@RequestBody ExportUidDto uid,HttpServletResponse response)
{
- SettlementTotalVO data = chargingOrderClient.settlementTotalR(uid.getTime()).getData();
+ Long userId = tokenService.getLoginUser().getUserid();
+ SettlementTotalVO data = chargingOrderClient.settlementTotalR(uid.getTime(),userId).getData();
try {
response.setCharacterEncoding(Constants.UTF8);
response.setContentType("application/vnd.ms-excel");
@@ -453,6 +455,8 @@
settlementExportVO.setVehicleBrand(data5.get(0).getVehicleBrand());
}
+ }else{
+ settlementExportVO.setLicensePlate(chargingOrder.getPlateNum());
}
settlementExportVO.setSiteCode(data3.get(0).getCode());
settlementExportVO.setSiteName(data3.get(0).getName());
--
Gitblit v1.7.1