对不需要做数字处理的字段以可变参数形式传入不需要时不用传

yiming
1 parent de2c4e80
Showing 2 changed files with 13 additions and 11 deletions
src/main/java/com/bsth/controller/forms/ExportController.java
src/main/java/com/bsth/util/ReportUtils.java
@@ -272,7 +272,7 @@ public class ExportController {
 			listI.add(resList.iterator());
 			String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
 			ee.excelReplace(listI, new Object[] { map }, path + "mould/singledata.xls",
-					path + "export/路单数据" + sdfSimple.format(sdfMonth.parse(map.get("startDate").toString())) + ".xls");
+					path + "export/路单数据" + sdfSimple.format(sdfMonth.parse(map.get("startDate").toString())) + ".xls",new String[]{"jsy","sgh"});
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -31,7 +31,6 @@ public class ReportUtils {
 	private final Pattern pattern = Pattern.compile("^\\d+(\\.\\d*)?$");
-	private final String[] NaN={"jsy","sgh"};
 	/**
 	 * /**
@@ -48,7 +47,7 @@ public class ReportUtils {
 	 *            生成路径
 	 */
 	public void excelReplace(List<Iterator<?>> list, Object[] tArray,
-			String sourcePath, String targetPath) {
+			String sourcePath, String targetPath,String...NaN) {
 		try {
 			// 把源文件放入流中
 			POIFSFileSystem fs = new POIFSFileSystem(new FileInputStream(
@@ -98,13 +97,13 @@ public class ReportUtils {
 							Iterator<?> iterator = list.get(listIndex);
 							// 根据模板创建行并填弃数据，返回增加的行数
 							int rowCount = iteratorFillCellValue(wb, sheet,
-									cell, iterator, i, rowNum, key);
+									cell, iterator, i, rowNum, key,NaN);
 							rowNum += rowCount;
 							i += rowCount;
 							break;
 						} else {
 							// 直接填充数据的列，从对象数组中取得值，这里的数组不传值
-							getValueAndSetCellValue(cell, key, tArray, new String[]{""});
+							getValueAndSetCellValue(cell, key, tArray, new String[]{""},NaN);
 						}
 					}
@@ -128,9 +127,10 @@ public class ReportUtils {
 	 * @param tArray
 	 * @param sourcePath 模板路径
 	 * @param targetPath 生成路径
+	 * @param NaN 非数字参数（String[] 传入的key不做数字处理）
 	 */
 	public void excelMoreSheetReplace(List<List<Iterator<?>>> sheetList, Object[] tArray,
-			String sourcePath, String targetPath) {
+			String sourcePath, String targetPath,String...NaN) {
 		try {
 			// 把源文件放入流中
 			POIFSFileSystem fs = new POIFSFileSystem(new FileInputStream(
@@ -188,7 +188,7 @@ public class ReportUtils {
 								break;
 							} else {
 								// 直接填充数据的列，从对象数组中取得值，这里的数组不传值
-								getValueAndSetCellValue(cell, key, tArray, new String[]{""});
+								getValueAndSetCellValue(cell, key, tArray, new String[]{""},NaN);
 							}
 						}
@@ -431,11 +431,12 @@ public class ReportUtils {
 	 *            表格总行数
 	 * @param key
 	 *            表格内容
+	 * @param NaN 非数字参数（String[] 传入的key不做数字处理）
 	 * @return
 	 */
 	private int iteratorFillCellValue(HSSFWorkbook wb, HSSFSheet sheet,
 			HSSFCell cell, Iterator<?> iterator, int index, int rowNum,
-			String key) {
+			String key,String...NaN) {
 		int rowCount = 0;
 		Object obj = null;
 		int p = 0;
@@ -486,7 +487,7 @@ public class ReportUtils {
 					if (key.trim().indexOf(" ") != -1) {
 						key = key.split(" ")[1];
 					}
-					getValueAndSetCellValue(cell, key, obj,new String[]{listIndex+""});
+					getValueAndSetCellValue(cell, key, obj,new String[]{listIndex+""},NaN);
 				}
 				// list的数量
 				listIndex ++;
@@ -504,10 +505,11 @@ public class ReportUtils {
 	 * @param key 列内容
 	 * @param obj 数据源对象
 	 * @param args 其他参数 数组
+	 * @param NaN 非数字参数（String[] 传入的key不做数字处理）
 	 * 数组内容：
 	 * 0位：在list中的第几条数据
 	 */
-	private void getValueAndSetCellValue(HSSFCell cell, String key, Object obj, String[] args) {
+	private void getValueAndSetCellValue(HSSFCell cell, String key, Object obj, String[] args,String...NaN) {
 		try {
 			// 保有存单元格的内容
 			String cellValue = key = key.replace("\\n", "");
@@ -561,7 +563,7 @@ public class ReportUtils {
 			}
 			cell.setCellValue(cellValue);
 			Matcher matcher = pattern.matcher(cellValue);
-			if (matcher.matches()&&!Arrays.asList(NaN).contains(fieldName)) {
+			if (matcher.matches() && !Arrays.asList(NaN).contains(fieldName)) {
 				if (cellValue.indexOf(".") > -1) {
 					cell.setCellValue(Double.parseDouble(cellValue));
 				} else {