From 57d1bdeba6f744f0da9c3d1e01e54263ec2d19d8 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 07 九月 2024 10:48:21 +0800
Subject: [PATCH] 代码提交
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TApplyChargingPileController.java | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 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 0f7488d..22b010c 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
@@ -1,5 +1,11 @@
package com.ruoyi.chargingPile.controller;
+import java.time.LocalDateTime;
import java.math.BigDecimal;
+
+import com.ruoyi.chargingPile.api.feignClient.SiteClient;
+import com.ruoyi.chargingPile.api.model.Partner;
+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.TChargingOrder;
import com.ruoyi.order.api.model.TSettlementConfirm;
@@ -51,6 +57,8 @@
import java.net.URLEncoder;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.LinkedList;
import java.util.List;
import java.util.regex.Pattern;
@@ -71,6 +79,8 @@
private final RedisService redisService;
@Resource
private ChargingOrderClient chargingOrderClient;
+ @Resource
+ private SiteClient siteClient;
@Autowired
public TApplyChargingPileController(TApplyChargingPileService applyChargingPileService, TokenService tokenService, RedisService redisService) {
@@ -213,9 +223,7 @@
applyChargingPileExportDto.setIs3("否");
}
exportDtos.add(applyChargingPileExportDto);
-
}
-
// excel模板封装
ExcelWriterBuilder excelWriterBuilder = EasyExcelFactory.write(response.getOutputStream());
InputStream stream = Thread.currentThread().getContextClassLoader().getResourceAsStream("template/" +"充电桩申请记录" + ".xlsx");
@@ -273,11 +281,20 @@
}
return R.ok();
}
+
@ApiOperation(value = "下载", tags = {"管理后台-结算表记录"})
@GetMapping("/downloadSettlement")
public R downloadSettlement(String uid,HttpServletResponse response)
{
TSettlementConfirm data = chargingOrderClient.downloadSettlement(uid).getData();
+ List<Site> data1 = siteClient.getSiteByIds(Arrays.asList(data.getSiteId())).getData();
+ if (!data1.isEmpty()){
+ data.setSiteName(data1.get(0).getName());
+ }
+ Partner data2 = siteClient.getPartnerR(data.getPartnerId()).getData();
+ if (data2!=null){
+ data.setPartnerName(data2.getName());
+ }
List<TSettlementConfirm> chargingBillVOS = new ArrayList<>();
chargingBillVOS.add(data);
try {
@@ -296,9 +313,12 @@
// 自动释放资源
try (ExcelWriter excelWriter = excelWriterBuilder.withTemplate(stream).build()) {
WriteSheet writeSheet = EasyExcel.writerSheet().build();
+ WriteSheet writeSheet2 = EasyExcel.writerSheet().build();
+ WriteSheet writeSheet3 = EasyExcel.writerSheet().build();
FillConfig fillConfig = FillConfig.builder().direction(WriteDirectionEnum.HORIZONTAL).build();
excelWriter.fill(new FillWrapper("data1", chargingBillVOS), fillConfig, writeSheet);
- excelWriter.fill(new FillWrapper("data2", chargingBillVOS), fillConfig, writeSheet);
+ excelWriter.fill(new FillWrapper("data2", chargingBillVOS), fillConfig, writeSheet2);
+ excelWriter.fill(new FillWrapper("data3", data.getList()), fillConfig, writeSheet3);
excelWriter.finish();
} catch (Exception e) {
return R.fail("excel导出失败！");
--
Gitblit v1.7.1