Merge branch 'main' of http://10.10.14.176:3000/huanghai/QingLong

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

@@ -913,7 +913,7 @@ public class CollectController extends Controller {
         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, bureau_id, person_id, fileName, file_id, suffix, file_size);
         //返回结果
         Kv kv = Kv.by("success", true);
         kv.set("message", "上传成功！");
@@ -921,6 +921,8 @@ public class CollectController extends Controller {
         kv.set("file_id", file_id);
         kv.set("file_size", file_size);
         kv.set("fileName", fileName);
+        kv.set("input_id", input_id);
+        kv.set("type_id", type_id);
         renderJson(kv);
     }
 
@@ -942,8 +944,7 @@ public class CollectController extends Controller {
      * 功能：获取指定任务，指定单位上传的附件列表
      *
      * @param job_id
-     * @param bureau_id
-     * http://10.10.21.20:9000/QingLong/collect/getJobUploadList?job_id=42
+     * @param bureau_id http://10.10.21.20:9000/QingLong/collect/getJobUploadList?job_id=42
      */
     @Before({GET.class})
     @IsLoginInterface({})