'commit'

src/main/java/com/dsideal/base/DataEase/Model/DataEaseModel.java

@@ -86,7 +86,7 @@ public class DataEaseModel {
 
                 if (tableName.equals(excludeTableName)) {
                     if (StrKit.isBlank(value)) {
-                        record.set(colName,null);
+                        record.set(colName, null);
                     } else {
                         if (isInteger(value)) {
                             record.set(colName, Integer.parseInt(value));
@@ -750,6 +750,7 @@ public class DataEaseModel {
         }
         Db.use(DB_NAME).batchSave(tableName, list, 100);
     }
+
     /**
      * 省管理员辅助市州录入:上传Excel文件
      */
@@ -757,7 +758,7 @@ public class DataEaseModel {
         //根据数据集id获取表名
         String tableName = getDataSetById(dataset_id).getStr("table_name");
         // 清除数据
-        String sql = "truncate table `" + tableName +"`";
+        String sql = "truncate table `" + tableName + "`";
         Db.use(DB_NAME).update(sql);
 
         List<Record> list = new ArrayList<>();
@@ -770,8 +771,12 @@ public class DataEaseModel {
                 //第一行是表头
                 String colName = listExcelRow.getFirst().getData().get(j);
 
-                if (StrKit.isBlank(value.trim()) || colName.contains("数值") || colName.contains("万人")) {
+                if ((StrKit.isBlank(value.trim()) && colName.contains("数值")) ||
+                        (StrKit.isBlank(value.trim()) && colName.contains("万人"))) {
                     record.set(colName, null);
+                } else if (colName.contains("数值")) {
+                    //去掉非数字
+                    record.set(colName, value.trim().replaceAll("[^\\d.]", ""));
                 } else if (isInteger(value)) {
                     record.set(colName, Integer.parseInt(value));
                 } else if (isDouble(value)) {
@@ -782,6 +787,9 @@ public class DataEaseModel {
             }
             list.add(record);
         }
+        for (Record record : list) {
+            System.out.println(record);
+        }
         Db.use(DB_NAME).batchSave(tableName, list, 100);
     }
 }