From cabf2cffb64e98401d87c2e03537720390e2f4ea Mon Sep 17 00:00:00 2001
From: xinyb <574600396@qq.com>
Date: 星期四, 05 九月 2024 10:01:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/com/yc/service/panel/v2/PanelServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/com/yc/service/panel/v2/PanelServiceImpl.java b/src/com/yc/service/panel/v2/PanelServiceImpl.java
index a3f38b4..0522f24 100644
--- a/src/com/yc/service/panel/v2/PanelServiceImpl.java
+++ b/src/com/yc/service/panel/v2/PanelServiceImpl.java
@@ -190,13 +190,13 @@
// 鎶婇渶瑕佸鍑虹殑鍐欏埌excel
String filename = "/panel_data";
- if (formType == 2) {
+ if (formType == 2||formType==20) {
filename = "/data";// 鏄负浜嗕綔涓烘牸绾挎暟鎹潵澶勭悊
}
if (pHelper.excelContext.length() > 0) {
try {
- FileUtil.writeFile((formType == 2 ? gformInfo.get("formname") + "-" : "") + pHelper.excelContext + "-"
+ FileUtil.writeFile(((formType == 2||formType == 20) ? gformInfo.get("formname") + "-" : "") + pHelper.excelContext + "-"
+ pHelper.tableIs + "-" + pHelper.excelField + "-" + pHelper.excelLoca + "-"
+ pHelper.excelTitles, pHelper.URI + pHelper.realPath + "/" + formType + filename);// 鍐欏埌鏂囦欢閲岄潰
pHelper.isto = true;
--
Gitblit v1.8.0