部分字段不做数字处理

yiming
1 parent 4a162f66
Showing 1 changed file with 6 additions and 8 deletions
src/main/java/com/bsth/util/ReportUtils.java
@@ -3,12 +3,7 @@ package com.bsth.util;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
+import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -36,6 +31,8 @@ public class ReportUtils {
 	private final Pattern pattern = Pattern.compile("^\\d+(\\.\\d*)?$");
+	private final String[] NaN={"jsy","sgh"};
+
 	/**
 	 * /**
 	 * 
@@ -515,6 +512,7 @@ public class ReportUtils {
 			// 保有存单元格的内容
 			String cellValue = key = key.replace("\\n", "");
 			String tmpKey;
+			String fieldName = null;
 			// 判断单元格内容是否是公式
 			if(cell.getCellType() == HSSFCell.CELL_TYPE_FORMULA){
 				Pattern p=Pattern.compile("(\\d+)");  //  
@@ -538,7 +536,7 @@ public class ReportUtils {
 						String className = tmpKey.substring(0, tmpKey.indexOf("."));
 						// 取得类的全限定名
 						String classWholeName = packaegName + className;
-						String fieldName = tmpKey.substring(tmpKey.indexOf(".") + 1);
+						fieldName = tmpKey.substring(tmpKey.indexOf(".") + 1);
 						// 如果obj是数组，循环判断哪个对象是对应的
 						if (obj instanceof Object[]) {
 							Object[] objs = (Object[]) obj;
@@ -563,7 +561,7 @@ public class ReportUtils {
 			}
 			cell.setCellValue(cellValue);
 			Matcher matcher = pattern.matcher(cellValue);
-			if (matcher.matches()) {
+			if (matcher.matches()&&!Arrays.asList(NaN).contains(fieldName)) {
 				if (cellValue.indexOf(".") > -1) {
 					cell.setCellValue(Double.parseDouble(cellValue));
 				} else {