Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

watero-rst-web/src/main/java/com/iamberry/rst/utils/ExcelUtil.java

@@ -7,6 +7,7 @@ import com.iamberry.rst.faces.cm.SalesOrderService;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.hssf.usermodel.HSSFCell;
 import org.apache.poi.hssf.usermodel.HSSFCellStyle;
+import org.apache.poi.hssf.usermodel.HSSFDataFormatter;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@@ -867,7 +868,8 @@ public class ExcelUtil {
                 if (DateUtil.isCellDateFormatted(cell)) {
                     return fmt.format(cell.getDateCellValue()); //日期型
                 }
-                return String.valueOf((new Double(cell.getNumericCellValue())).intValue()); //数字
+                DecimalFormat df = new DecimalFormat("#");
+                return df.format(new Double(cell.getNumericCellValue())); //数字
             case Cell.CELL_TYPE_BOOLEAN: //布尔型
                 return String.valueOf(cell.getBooleanCellValue());
             case Cell.CELL_TYPE_BLANK: //空白
@@ -875,6 +877,16 @@ public class ExcelUtil {
             default: //错误
                 return "ERROR";
         }
+    }
 
+    /**
+     * excel 强制获取text文本
+     * @param cell
+     * @return
+     */
+    public static String getTextValue(Cell cell) {
+        if (cell == null) return null;
+        return cell.getStringCellValue();
     }
+
 }