diff --git a/WebRoot/Excel/3E6CDF34-7307-4685-8D3E-EC32B4AA1D0A.jpg b/WebRoot/Excel/3E6CDF34-7307-4685-8D3E-EC32B4AA1D0A.jpg new file mode 100644 index 00000000..f48b1538 Binary files /dev/null and b/WebRoot/Excel/3E6CDF34-7307-4685-8D3E-EC32B4AA1D0A.jpg differ diff --git a/WebRoot/Excel/7FD08962-08E4-4067-A81E-8069C0A218DC.docx b/WebRoot/Excel/7FD08962-08E4-4067-A81E-8069C0A218DC.docx new file mode 100644 index 00000000..39c67aa3 Binary files /dev/null and b/WebRoot/Excel/7FD08962-08E4-4067-A81E-8069C0A218DC.docx differ diff --git a/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java b/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java index 02f85c8e..a425e9e2 100644 --- a/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java +++ b/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java @@ -1112,8 +1112,8 @@ public class CollectController extends Controller { Record rs = personModel.getLoginInfoByPersonId(person_id); bureau_id = rs.get("bureau_id"); } - Record record = cm.getFormFillJob(job_id, bureau_id); - renderJson(record); + String json= cm.getFormFillJob(job_id, bureau_id); + renderJson(json); } /****以下为管理组概念*****************************************/ 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 0715335d..d8efd99d 100644 --- a/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java +++ b/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java @@ -1192,7 +1192,7 @@ public class CollectModel { Db.save(table_name, "id", record); //保存原始JSON数据 sql = "update t_collect_job_bureau set form_fill_json=? where job_id=? and bureau_id=?"; - Db.update(sql, form_json, job_id, bureau_id); + Db.update(sql, json, job_id, bureau_id); //保存多选结果 //先删除 @@ -1223,9 +1223,9 @@ public class CollectModel { * @param job_id * @param bureau_id */ - public Record getFormFillJob(int job_id, String bureau_id) { + public String getFormFillJob(int job_id, String bureau_id) { String sql = "select form_fill_json from t_collect_job_bureau where bureau_id=? and job_id=?"; - return Db.findFirst(sql, bureau_id, job_id); + return Db.findFirst(sql, bureau_id, job_id).getStr("form_fill_json"); } /**