diff --git a/WebRoot/Excel/00d24101-2412-4ad2-a6e5-919091ea932a.xlsx b/WebRoot/Excel/00d24101-2412-4ad2-a6e5-919091ea932a.xlsx
new file mode 100644
index 00000000..42a0120a
Binary files /dev/null and b/WebRoot/Excel/00d24101-2412-4ad2-a6e5-919091ea932a.xlsx differ
diff --git a/WebRoot/Excel/50f5353a-0dec-431f-bbbb-02375385034c.xlsx b/WebRoot/Excel/50f5353a-0dec-431f-bbbb-02375385034c.xlsx
new file mode 100644
index 00000000..bc408419
Binary files /dev/null and b/WebRoot/Excel/50f5353a-0dec-431f-bbbb-02375385034c.xlsx differ
diff --git a/WebRoot/Excel/81c26fae-7948-45ed-8894-18c01e9aeed7.xlsx b/WebRoot/Excel/81c26fae-7948-45ed-8894-18c01e9aeed7.xlsx
new file mode 100644
index 00000000..13d34cc1
Binary files /dev/null and b/WebRoot/Excel/81c26fae-7948-45ed-8894-18c01e9aeed7.xlsx differ
diff --git a/WebRoot/Excel/a11f09e3-402f-4071-b032-6e8bda1cd57b.xlsx b/WebRoot/Excel/a11f09e3-402f-4071-b032-6e8bda1cd57b.xlsx
new file mode 100644
index 00000000..bc408419
Binary files /dev/null and b/WebRoot/Excel/a11f09e3-402f-4071-b032-6e8bda1cd57b.xlsx differ
diff --git a/WebRoot/Excel/d08f839d-43b6-4559-907d-9ca15a68a68e.xlsx b/WebRoot/Excel/d08f839d-43b6-4559-907d-9ca15a68a68e.xlsx
new file mode 100644
index 00000000..81a2e2e0
Binary files /dev/null and b/WebRoot/Excel/d08f839d-43b6-4559-907d-9ca15a68a68e.xlsx differ
diff --git a/WebRoot/Excel/e41cf9e7-fd08-4d8f-812a-04824948a3aa.xlsx b/WebRoot/Excel/e41cf9e7-fd08-4d8f-812a-04824948a3aa.xlsx
new file mode 100644
index 00000000..89bd517c
Binary files /dev/null and b/WebRoot/Excel/e41cf9e7-fd08-4d8f-812a-04824948a3aa.xlsx differ
diff --git a/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java b/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java
index 22ff1567..7e8a9928 100644
--- a/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java
+++ b/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java
@@ -245,8 +245,8 @@ public class CollectModel {
         sql = "update t_collect_job_sheet set upload_excel_filename_finish=? where job_id=?";
         Db.update(sql, upload_excel_filename_finish, job_id);
 
-        sql = "update t_collect_mapping set upload_excel_filename_finish=? where job_id=?";
-        Db.update(sql, upload_excel_filename_finish, job_id);
+        sql = "update t_collect_mapping as t1  set upload_excel_filename_finish=t2.upload_excel_filename_finish from t_collect_job_sheet as t2 where t1.table_name=t2.table_name and t2.job_id=?";
+        Db.update(sql, job_id);
     }
 
     /**
@@ -362,7 +362,7 @@ public class CollectModel {
             record.set("excel_column_idx", i);
             record.set("original_name", list.get(i).getStr("original_name"));
             record.set("allow_blank", list.get(i).getBoolean("allow_blank"));
-            record.set("column_type", convertDataType(list.get(i).getStr("data_type_id")));
+            record.set("column_type", convertDataType(list.get(i).getInt("data_type_id")));
             record.set("upload_excel_filename_finish", "");
             record.set("sheet_index", sheet_index);
             record.set("sheet_name", sheet_name);
@@ -380,15 +380,14 @@ public class CollectModel {
     /**
      * 功能：PG数据库数据类型与EXCEL中数据类型的转换关系
      *
-     * @param pgColumnDataType
      * @return
      */
-    public String convertDataType(String pgColumnDataType) {
+    public String convertDataType(int data_type_id) {
         String res = "String";
-        if (pgColumnDataType.startsWith("varchar")) res = "String";
-        else if (pgColumnDataType.startsWith("int")) res = "Integer";
-        else if (pgColumnDataType.startsWith("double")) res = "Double";
-        else if (pgColumnDataType.startsWith("date")) res = "Date";
+        if (data_type_id == 1) res = "String";
+        else if (data_type_id == 2) res = "Integer";
+        else if (data_type_id == 3) res = "Double";
+        else if (data_type_id == 4) res = "Date";
         return res;
     }