'commit'

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

@@ -927,14 +927,13 @@ public class CollectController extends Controller {
      * 功能：获取指定任务，指定单位（人员）上传的附件列表
      *
      * @param job_id
-     * @param input_id
      * @param bureau_id
      * @param person_id
      */
     @Before({GET.class})
     @IsLoginInterface({})
-    public void getJobUploadList(String job_id, String input_id, String bureau_id, String person_id) {
-        List<Record> list = cm.getJobUploadList(job_id, input_id, bureau_id, person_id);
+    public void getJobUploadList(String job_id,  String bureau_id, String person_id) {
+        List<Record> list = cm.getJobUploadList(job_id,  bureau_id, person_id);
         renderJson(CommonUtil.renderJsonForLayUI(list));
     }
 

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

@@ -1047,7 +1047,7 @@ public class CollectModel {
             String column_name = jo.getString("id");//字段名
             int data_type_id = jo.getInteger("data_type_id");// 数据类型
             String column_type = getDataType(data_type_id, DataTypeConst.PG_DATA_TYPE);
-            colSql +="\""+ column_name + "\" " + column_type;
+            colSql += "\"" + column_name + "\" " + column_type;
 
             if (required) colSql += " NOT NULL ";
             colSql += ",";
@@ -1217,14 +1217,12 @@ public class CollectModel {
      * 功能：获取指定任务，指定单位（人员）上传的附件列表
      *
      * @param job_id
-     * @param input_id
      * @param bureau_id
      * @param person_id
      */
-    public List<Record> getJobUploadList(String job_id, String input_id, String bureau_id, String person_id) {
+    public List<Record> getJobUploadList(String job_id, String bureau_id, String person_id) {
         Kv kv = Kv.create();
         kv.set("job_id", job_id);
-        kv.set("input_id", input_id);
         if (!StrKit.isBlank(bureau_id)) kv.set("bureau_id", bureau_id);
         if (!StrKit.isBlank(person_id)) kv.set("person_id", person_id);
         SqlPara sqlPara = Db.getSqlPara("Collect.getJobUploadList", kv);

src/main/resource/Sql/Collect.sql

@@ -70,7 +70,7 @@
     #end
     -- 功能：获取指定任务，指定单位（人员）上传的附件列表
     #sql("getJobUploadList")
-     select * from t_collect_uploadfile where job_id=#para(job_id) and input_id=#para(input_id)
+     select * from t_collect_uploadfile where job_id=#para(job_id)
      #if(bureau_id)
        and bureau_id=#para(bureau_id)
      #end