fix conflict

unknown
2 parents f78fc6a6 6b3caafd
Showing 1 changed file with 11 additions and 4 deletions Show diff stats
src/main/java/com/taover/util/UtilExcel.java
@@ -400,7 +400,7 @@ public class UtilExcel {
 		if(end > rowLimit){
 			end = rowLimit;
 		}
-		DecimalFormat df = new DecimalFormat("0.#");
+		DecimalFormat df = new DecimalFormat("0.####");
 		for(int i=start; i<end+1; ++i){
 			Row row = sheet.getRow(i);
 			if(row == null){
@@ -507,8 +507,15 @@ public class UtilExcel {
 	public static void main(String args[]){
 		//String filepath = "C:\\Users\\root\\Desktop\\千丁-6.27.xlsx";
-		String filepath = "C:\\Users\\gaoming\\Desktop\\测试返单数量.xlsx";
-		//String filepath = "C:\\Users\\EDZ\\Desktop\\aaa.xlsx";
+		//String filepath = "C:\\Users\\gaoming\\Desktop\\cccc.xls";
+		DecimalFormat df = new DecimalFormat("0.####");
+		 
+		System.out.println(df.format(3.333113F));
+		System.out.println(df.format(3.3));
+		System.out.println(df.format(3.3300));
+		
+		
+		String filepath = "C:\\Users\\EDZ\\Desktop\\acccc.xls";
 		List<List<Object>> data = null;
 		try {
@@ -532,7 +539,7 @@ public class UtilExcel {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
-		List<Short> styleList = new ArrayList<Short>();
+//		List<Short> styleList = new ArrayList<Short>();
 //		for(int i=0; i<data.size(); ++i){
 //			if(i == 1)styleList.add(Short.valueOf(HSSFColor.RED.index));
 //			else styleList.add(null);