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

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

@@ -2013,6 +2013,7 @@ public class CollectModel {
             list.add(record);
         }
         Db.batchSave("t_collect_job_target", list, 500);
+        System.out.println("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA");
         //回写完成标志
         writeJobFinish(job_id, status_code, bureau_id, null);
     }

src/main/resource/Sql/Collect.sql

@@ -53,7 +53,8 @@
         -- 2122：人员 市 转发下级 已反馈
         -- 2132: 人员 市 转发给单位 已反馈
         -- 2232: 人员 县 转发本单位 已反馈
-        and t3.status_code in (1111,1211,1122,2122,2132,2232)) as child_reply_count
+        -- 2311: 人员 单位发的，填报 已填报
+        and t3.status_code in (1111,1211,1122,2122,2132,2232,2311)) as child_reply_count
         from t_collect_job as t1
         inner join t_collect_job_target as t2 on t1.job_id=t2.job_id
         where t2.target_id = #para(bureau_id)