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

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

@@ -800,7 +800,7 @@ public class CollectModel {
         String city_id = gm.getGlobalValueByKey("install_area");
         kv.set("city_id", city_id);
         //查县区
-        if (!StrKit.isBlank(area_id)) {
+        if (!StrKit.isBlank(area_id) && !area_id.equals("00000000-0000-0000-0000-000000000000")) {
             kv.set("area_id", area_id);
         }
         //市直属
@@ -921,6 +921,8 @@ public class CollectModel {
         Db.update(sql, memo, date, job_id);
         sql = "delete from t_collect_job_target where job_id=?";
         Db.update(sql, job_id);
+        Record jobRecord = getJob(job_id);
+        String bureau_id = jobRecord.getStr("bureau_id");//发布单位id
         //写任务分派表
         List<Record> list = new ArrayList<>();
         for (String s : bureauSet) {
@@ -932,6 +934,7 @@ public class CollectModel {
                 //fill_type_id		填报任务类型：1：填报，2：转发，3：填报+转发
             else record.set("fill_type_id", 1);//默认值是填报
             record.set("target_type_id", target_type_id);
+            record.set("bureau_id", bureau_id);
             list.add(record);
         }
         Db.batchSave("t_collect_job_target", list, 100);
@@ -1539,6 +1542,7 @@ public class CollectModel {
             record.set("target_id", s);
             record.set("is_finish", 0);
             record.set("fill_type_id", 1);
+            record.set("bureau_id", bureau_id);
             record.set("parent_id", job_id);
             record.set("forward_progress", 1);//已转发
             record.set("target_type_id", target_type_id);//到单位：1，到人：2

src/main/resource/Sql/Collect.sql

@@ -74,11 +74,9 @@
         t3.person_name as person_name,
         t3.telephone as telephone,
         t3.email as email,
-        (select t2.job_id from t_collect_job_target as t2 inner join t_collect_job as t4 on t2.job_id=t4.job_id where t2.target_id=t1.target_id and t4.parent_id=t1.job_id)
-        as child_job_id, --子任务id
-        (select count(1) from t_collect_job_target as t2 inner join t_collect_job as t4 on t2.job_id=t4.job_id where t2.target_id=t1.target_id and t4.parent_id=t1.job_id)
+        (select count(1) from t_collect_job_target as t2 where t2.parent_id=t1.job_id and t2.bureau_id=t1.bureau_id)
         as forward_count,     -- 县区教育局转发给了多少个单位
-        (select count(1) from t_collect_job_target as t2 inner join t_collect_job as t4 on t2.job_id=t4.job_id where t2.target_id=t1.target_id and t4.parent_id=t1.job_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.bureau_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