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

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

@@ -1298,7 +1298,7 @@ public class CollectModel {
         }
         Db.save(table_name, "id", record);
         //保存原始JSON数据+修改完成标识
-        sql = "update t_collect_job_target set form_fill_json=?,is_finish=1 where job_id=? and target_id=?";
+        sql = "update t_collect_job_target set form_fill_json=?,is_finish=1,fill_time=now() where job_id=? and target_id=?";
         Db.update(sql, json, job_id, bureau_id);
 
         //保存多选结果

src/main/resource/Sql/Collect.sql

@@ -46,7 +46,7 @@
     #end
     -- 任务列表
     #sql("viewJobList")
-        select t1.*,t2.is_finish,
+        select t1.*,t2.is_finish,t2.forward_progress,
         (select t3.job_id from t_collect_job as t3 where t1.job_id=t3.parent_id) as child_job_id,
        (select count(1) from t_collect_job_target as t3 where t3.parent_id=t1.job_id and t3.bureau_id=t2.target_id)
            as forward_count,     -- 县区教育局转发给了多少个单位