From 9d259cafb55d0e26b6149aa95e49140ae3b983f4 Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.16>
Date: 星期二, 23 十月 2018 09:04:22 +0800
Subject: [PATCH] 通用表格导出方法完善

---
 gx_tieta/src/com/fgkj/servlets/ExportTableServlet.java |   23 +++++++++++++----------
 1 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/servlets/ExportTableServlet.java b/gx_tieta/src/com/fgkj/servlets/ExportTableServlet.java
index 93dcf64..73b445c 100644
--- a/gx_tieta/src/com/fgkj/servlets/ExportTableServlet.java
+++ b/gx_tieta/src/com/fgkj/servlets/ExportTableServlet.java
@@ -152,19 +152,20 @@
 			//瀹氫箟涓�涓伐浣滅翱
 			HSSFWorkbook workbook = new HSSFWorkbook();
 			
-			
-			if(!ServletUtils.isNotNull(exp_page_names_str)){
-				return;
-				//exp_page_names[0] = "sheet1";
-			}else{
+			if(ServletUtils.isNotNull(exp_thead_str)){
 				exp_page_names = exp_page_names_str.split(exp_page_break);			//鍒嗗壊宸ヤ綔绨跨殑鍚嶇О
 				
 				String[] exp_thead_sheets = exp_thead_str.split(exp_page_break);
 				String[] exp_tbody_sheets = exp_tbody_str.split(exp_page_break);	
-				
-				
-				for (int i = 0; i < exp_page_names.length && exp_page_names.length >= exp_thead_sheets.length; i++) {
-					HSSFSheet sheet = workbook.createSheet(exp_page_names[i]);
+				if(!ServletUtils.isNotNull(exp_page_names_str)){
+					exp_page_names = new String[]{};
+					for(int s=0;s<exp_tbody_sheets.length;s++){
+						exp_page_names[s] = "sheet"+s;
+					}
+				}					
+					
+				for (int i = 0; i < exp_thead_sheets.length; i++) {
+					HSSFSheet sheet = i<exp_page_names.length?workbook.createSheet(exp_page_names[i]):workbook.createSheet();
 					String[] exp_thead = exp_thead_sheets[i].split(exp_data_break);
 					String[] exp_tbody = exp_tbody_sheets[i].split(exp_data_break);
 					
@@ -194,7 +195,9 @@
 						cell.setCellValue(text);						
 					}					
 				}					
-			}		
+				
+			}
+					
 			// 杞爜闃叉涔辩爜
 			resp.addHeader("Content-Disposition", "attachment;filename="
 					+ new String(excelName.getBytes("gb2312"), "ISO8859-1")

--
Gitblit v1.9.1