diff --git a/WebRoot/Excel/40BBB21A-FA5D-4403-BA0D-3E747940AD65.jpg b/WebRoot/Excel/40BBB21A-FA5D-4403-BA0D-3E747940AD65.jpg new file mode 100644 index 00000000..0f107028 Binary files /dev/null and b/WebRoot/Excel/40BBB21A-FA5D-4403-BA0D-3E747940AD65.jpg differ diff --git a/WebRoot/Excel/417408EA-FA6D-4950-ABBA-F5F6D1988F65.jpg b/WebRoot/Excel/417408EA-FA6D-4950-ABBA-F5F6D1988F65.jpg new file mode 100644 index 00000000..0f107028 Binary files /dev/null and b/WebRoot/Excel/417408EA-FA6D-4950-ABBA-F5F6D1988F65.jpg differ diff --git a/WebRoot/Excel/520BBE9F-8540-4A33-A04C-1A7703F070C9.jpg b/WebRoot/Excel/520BBE9F-8540-4A33-A04C-1A7703F070C9.jpg new file mode 100644 index 00000000..0f107028 Binary files /dev/null and b/WebRoot/Excel/520BBE9F-8540-4A33-A04C-1A7703F070C9.jpg differ diff --git a/WebRoot/Excel/5268FB78-6F5E-464F-B92D-AD33365B3390.jpg b/WebRoot/Excel/5268FB78-6F5E-464F-B92D-AD33365B3390.jpg new file mode 100644 index 00000000..0f107028 Binary files /dev/null and b/WebRoot/Excel/5268FB78-6F5E-464F-B92D-AD33365B3390.jpg differ diff --git a/WebRoot/Excel/6E6AF81E-9467-4077-A181-20097CB80FD3.jpg b/WebRoot/Excel/6E6AF81E-9467-4077-A181-20097CB80FD3.jpg new file mode 100644 index 00000000..0f107028 Binary files /dev/null and b/WebRoot/Excel/6E6AF81E-9467-4077-A181-20097CB80FD3.jpg differ diff --git a/WebRoot/Excel/724B0BC6-1065-4B7B-B275-CA11DDE014B5.jpg b/WebRoot/Excel/724B0BC6-1065-4B7B-B275-CA11DDE014B5.jpg new file mode 100644 index 00000000..0f107028 Binary files /dev/null and b/WebRoot/Excel/724B0BC6-1065-4B7B-B275-CA11DDE014B5.jpg differ diff --git a/WebRoot/Excel/AE245511-135F-4EB5-A20C-61E4CFAF531C.jpg b/WebRoot/Excel/AE245511-135F-4EB5-A20C-61E4CFAF531C.jpg new file mode 100644 index 00000000..0f107028 Binary files /dev/null and b/WebRoot/Excel/AE245511-135F-4EB5-A20C-61E4CFAF531C.jpg 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 23d0e8eb..f09bed54 100644 --- a/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java +++ b/src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java @@ -1109,10 +1109,14 @@ public class CollectController extends Controller { Record rs = personModel.getLoginInfoByPersonId(person_id); String bureau_id = rs.getStr("bureau_id"); int job_id = getInt("job_id"); + int target_type_id = cm.getJob(job_id).getInt("target_type_id"); + String target_id = bureau_id; + if (target_type_id == 2) target_id = person_id; + String input_id = get("input_id"); int type_id = getInt("type_id"); //记录到数据库 - cm.saveUploadFile(job_id, input_id, type_id, bureau_id, person_id, fileName, file_id, suffix, file_size); + cm.saveUploadFile(job_id, input_id, type_id, target_id, person_id, fileName, file_id, suffix, file_size); //返回结果 Kv kv = Kv.by("success", true); kv.set("message", "上传成功!"); 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 971b1f69..c37c39f9 100644 --- a/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java +++ b/src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java @@ -1848,18 +1848,18 @@ public class CollectModel { * @param job_id * @param input_id * @param type_id - * @param bureau_id + * @param target_id * @param person_id * @param fileName * @param file_id * @param suffix * @param file_size */ - public int saveUploadFile(int job_id, String input_id, int type_id, String bureau_id, String person_id, String + public int saveUploadFile(int job_id, String input_id, int type_id, String target_id, String person_id, String fileName, String file_id, String suffix, String file_size) { Record record = new Record(); record.set("job_id", job_id); - record.set("bureau_id", bureau_id); + record.set("target_id", target_id); record.set("person_id", person_id); record.set("fileName", fileName); record.set("file_id", file_id);