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

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

@@ -1539,12 +1539,11 @@ public class CollectModel {
         for (String s : targetSet) {
             Record record = new Record();
             record.set("job_id", child_job_id);
-            record.set("target_id", s);
+            record.set("target_id", s); //23AB81F6-556D-460B-8547-8AEE4208090E 九台市电教站
             record.set("is_finish", 0);
             record.set("fill_type_id", 1);
-            record.set("bureau_id", bureau_id);
+            record.set("bureau_id", bureau_id);//62E95A91-A408-4BD4-AC8F-5063DD0F8680 九台市教育局
             record.set("parent_id", job_id);
-            record.set("forward_progress", 1);//已转发
             record.set("target_type_id", target_type_id);//到单位：1，到人：2
             list.add(record);
         }

src/main/resource/Sql/Collect.sql

@@ -74,9 +74,9 @@
         t3.person_name as person_name,
         t3.telephone as telephone,
         t3.email as email,
-        (select count(1) from t_collect_job_target as t2 where t2.parent_id=t1.job_id and t2.bureau_id=t1.bureau_id)
+        (select count(1) from t_collect_job_target as t2 where t2.parent_id=t1.job_id and t2.bureau_id=t1.target_id)
         as forward_count,     -- 县区教育局转发给了多少个单位
-        (select count(1) from t_collect_job_target as t2 where t2.parent_id=t1.job_id and t2.bureau_id=t1.bureau_id and t2.is_finish=1)
+        (select count(1) from t_collect_job_target as t2 where t2.parent_id=t1.job_id and t2.bureau_id=t1.target_id and t2.is_finish=1)
         as forward_fill_count -- 县区教育局转发给的单位完成了多少个填报工作
         from t_collect_job_target as t1
         inner join t_base_organization as t2 on t1.target_id=t2.org_id