'commit'

src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java

@@ -1219,7 +1219,6 @@ public class CollectController extends Controller {
         String bureau_name = bm.getOrgInfoById(bureau_id).getStr("org_name");//单位名称
         String s_class_id = rs.getStr("s_class_id");
         cm.saveFormJob(job_id, bureau_id, bureau_name, s_class_id, person_id, person_name, json);
-
         //回写完成标记
         cm.writeJobFinish(job_id, bureau_id, null);
 

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

@@ -2187,6 +2187,15 @@ public class CollectModel {
             Map<Integer, Record> _map = new HashMap<>();
             for (Record record : list) {
                 Record r = new Record();
+                //准备第几列用哪一个字段
+                String column_name=record.getStr("column_name");
+                if (column_name.equals("id")) continue;
+                if (column_name.equals("bureau_id")) continue;
+                if (column_name.equals("person_id")) continue;
+                if (column_name.equals("class_id")) continue;
+                if (column_name.equals("job_id")) continue;
+                if (column_name.equals("area_id")) continue;
+
                 r.set("column_name", record.getStr("column_name"));
                 r.set("original_name", record.getStr("original_name"));
                 _map.put(record.getInt("excel_column_idx") + 1, r);
@@ -2302,6 +2311,7 @@ public class CollectModel {
             if (column_name.equals("person_id")) continue;
             if (column_name.equals("class_id")) continue;
             if (column_name.equals("job_id")) continue;
+            if (column_name.equals("area_id")) continue;
             _map.put(idx++, r);
         }
         //获取数据