'commit'

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;
     }