From bcc957336749bde56862b59f84e7f17591e2a8ab Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期一, 14 十一月 2022 09:55:52 +0800
Subject: [PATCH] 更新导出模板
---
src/main/java/com/whyc/service/ExcelExportService.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/whyc/service/ExcelExportService.java b/src/main/java/com/whyc/service/ExcelExportService.java
index ad993f5..908a97d 100644
--- a/src/main/java/com/whyc/service/ExcelExportService.java
+++ b/src/main/java/com/whyc/service/ExcelExportService.java
@@ -72,6 +72,12 @@
info.setVolGoodCount(volGoodCount);
info.setChainResGoodCount(chainResGoodCount);
+ StationInfo stationInfo = info.getStationInfo();
+ if(stationInfo.getStationName2().equals("-")){
+ stationInfo.setStationName(stationInfo.getStationName1());
+ }else{
+ stationInfo.setStationName(stationInfo.getStationName1()+"-"+stationInfo.getStationName2());
+ }
map.put("dto", info);
//鍥剧墖
BASE64Decoder decoder = new BASE64Decoder();
@@ -166,6 +172,12 @@
map.put("resImage",resImage);
}
+ if(stationInfo.getStationName2().equals("-")){
+ stationInfo.setStationName(stationInfo.getStationName1());
+ }else{
+ stationInfo.setStationName(stationInfo.getStationName1()+"-"+stationInfo.getStationName2());
+ }
+
map.put("fileParam",param);
map.put("stationInfo",stationInfo);
//鎬讳綋璇勪环:鍐呴樆/鐢靛帇/杩炴帴鏉�/?瀹归噺
--
Gitblit v1.9.1