'commit'

Doc/数据上报系统测试账号.txt

@@ -31,6 +31,8 @@ truncate table t_collect_job restart identity;
 truncate table t_collect_job_sheet  restart identity;
 truncate table t_collect_job_sheet_col  restart identity;
 truncate table t_collect_mapping  restart identity;
+truncate table t_collect_job_bureau   restart identity;
+truncate table t_collect_group   restart identity;
 
 # 处理序列
 -- 查看所有序列

src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java

@@ -104,13 +104,13 @@ public class CollectModel {
             int colIdx = 0;
             for (Record r : list) {
                 String column_name = r.getStr("column_name");
-                String memo = r.getStr("memo");
+                String original_name = r.getStr("original_name");
                 Record writeRecord = new Record();
                 writeRecord.set("job_id", job_id);
                 writeRecord.set("sheet_index", sheetIdx);
                 writeRecord.set("column_index", colIdx);
                 writeRecord.set("column_name", column_name);
-                writeRecord.set("original_name", memo);
+                writeRecord.set("original_name", original_name);
                 writeRecord.set("data_type_id", 1);
                 writeRecord.set("allow_blank", true);
                 writeRecord.set("options", "");