diff --git a/WebRoot/Excel/84E3FF52-9672-417A-8101-44437152F95E.jpg b/WebRoot/Excel/84E3FF52-9672-417A-8101-44437152F95E.jpg new file mode 100644 index 00000000..5e19ecf7 Binary files /dev/null and b/WebRoot/Excel/84E3FF52-9672-417A-8101-44437152F95E.jpg 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 e4469389..9265e67c 100644 --- a/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java +++ b/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java @@ -1,6 +1,7 @@ package com.dsideal.QingLong.Collect.Model; import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.io.FileUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; @@ -1102,10 +1103,43 @@ public class CollectModel { record.set("job_id", job_id); record.set("bureau_id", bureau_id); record.set("person_id", person_id); + + Record rJob = getJob(job_id); + String form_json = rJob.getStr("form_json"); + JSONArray ja = JSONArray.parseArray(form_json); + Map _map = new HashMap<>(); + for (int i = 0; i < ja.size(); i++) { + JSONObject j2 = ja.getJSONObject(i); + int data_type_id = DataType.getFormDataType(j2); + _map.put(j2.getString("id"), data_type_id);//哪个字段是什么类型 + } + for (Map.Entry entry : jo.entrySet()) { String key = entry.getKey(); - Object value = entry.getValue(); - record.set(key, value); + int data_type_id = _map.get(key); + switch (data_type_id) { + case 0: + continue; + case 1://文本 + String v1 = entry.getValue().toString(); + record.set(key, v1); + break; + case 2://数字 + int v2 = Integer.parseInt(entry.getValue().toString()); + record.set(key, v2); + break; + case 3://小数 + double v3 = Double.parseDouble(entry.getValue().toString()); + record.set(key, v3); + break; + case 4: //日期 + Date v4 = DateUtil.parse(entry.getValue().toString()); + record.set(key, v4); + break; + default: + break; + } + } Db.save(table_name, "id", record); } @@ -1240,4 +1274,9 @@ public class CollectModel { SqlPara sqlPara = Db.getSqlPara("Collect.getJobUploadList", kv); return Db.find(sqlPara); } + + public static void main(String[] args) { + Date v4 = DateUtil.parse("2001-01-01"); + System.out.println(v4); + } } \ No newline at end of file