From d5c99e6ec92c79b0c5684553e303c428cdb59b47 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Tue, 25 May 2021 12:48:06 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=AF=86=E5=88=AB=20Excel=20=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/dataset/DataSetTableService.java  | 31 ++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
index 4283b3aae7..b6540ab380 100644
--- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
@@ -572,6 +572,7 @@ public class DataSetTableService {
                 return 0;
             case "TIME":
                 return 1;
+            case "LONG":
             case "INT":
                 return 2;
             case "DOUBLE":
@@ -778,12 +779,39 @@ public class DataSetTableService {
         inputStream.close();
 
         Map<String, Object> map = new HashMap<>();
+        inferFieldType(fields, data);
         map.put("fields", fields);
         map.put("data", jsonArray);
         map.put("sheets", sheets);
         return map;
     }
 
+    private void inferFieldType(List<TableFiled> fields, List<String[]> data){
+        if(CollectionUtils.isEmpty(fields) || CollectionUtils.isEmpty(data)) {
+            return;
+        }
+        String[] firstLine = data.get(0);
+        for (int i=0; i< fields.size()&& i < firstLine.length; i++) {
+            TableFiled filed = fields.get(i);
+            try{
+                Integer.valueOf(firstLine[i]);
+                filed.setFieldType("INT");
+                continue;
+            }catch (Exception ignore ){
+            }
+            try{
+                Long.valueOf(firstLine[i]);
+                filed.setFieldType("LONG");
+                continue;
+            }catch (Exception ignore ){}
+            try{
+                Double.valueOf(firstLine[i]);
+                filed.setFieldType("DOUBLE");
+                continue;
+            }catch (Exception ignore ){}
+        }
+    }
+
     private String readCell(Cell cell) {
         CellType cellTypeEnum = cell.getCellTypeEnum();
         if (cellTypeEnum.equals(CellType.STRING)) {
@@ -791,7 +819,8 @@ public class DataSetTableService {
         } else if (cellTypeEnum.equals(CellType.NUMERIC)) {
             double d = cell.getNumericCellValue();
             try {
-                return new Double(d).longValue() + "";
+                String value = String.valueOf(d);
+                return value.endsWith(".0") ? value.substring(0, value.length() -2):value;
             } catch (Exception e) {
                 BigDecimal b = new BigDecimal(d);
                 return b.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue() + "";