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

src/main/resource/Sql/Collect.sql

@@ -40,7 +40,7 @@
     #end
     -- 任务列表
     #sql("viewJobList")
-       select t1.*,t2.is_finish,t2.forward_progress,
+       select t1.*,t2.is_finish,t2.forward_progress,t2.forward_time,
        (select t3.job_id from t_collect_job as t3 where t1.job_id=t3.parent_id and t3.bureau_id=t2.target_id limit 1) as child_job_id, -- 按道理说只有1条
        (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,     -- 县区教育局转发给了多少个单位
        (select count(1) from t_collect_job_target as t3 where t3.parent_id=t1.job_id and t3.bureau_id=t2.target_id and t3.is_finish=1) as forward_fill_count -- 县区教育局转发给的单位完成了多少个填报工作
@@ -65,7 +65,7 @@
         #if(target_type_id)
          and t2.target_type_id=#para(target_type_id)
         #end
-        order by t1.job_id desc
+        order by t2.forward_time desc,t1.job_id desc
     #end
     -- 任务列表 (个人)
     #sql("viewJobListPerson")