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

src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java

@@ -1853,21 +1853,6 @@ public class CollectController extends Controller {
         renderJson(CommonUtil.renderJsonForLayUI(list));
     }
 
-    /**
-     * 功能: 任务发布者，查看发布的任务填充情况(人员)
-     *
-     * @param job_id 任务ID
-     */
-    @Before({GET.class})
-    @IsLoginInterface({})
-    @IsNumericInterface({"job_id"})
-    public void viewJobPerson(int job_id) {
-        //操作人员
-        String person_id = SessionKit.get(getRequest(), getResponse(), "person_id");
-        Record record = cm.viewJobPerson(person_id, job_id);
-        renderJson(record);
-    }
-
     /**
      * 功能：查看我该填报或者我已填报的任务列表(人员)
      *

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

@@ -2405,15 +2405,7 @@ public class CollectModel {
         return pageRecord;
     }
 
-    /**
-     * 功能: 任务发布者，查看发布的任务填充情况(人员)
-     *
-     * @param job_id 任务ID
-     */
-    public Record viewJobPerson(String person_id, int job_id) {
-        String sql = "select * from t_collect_job_target where job_id=? and target_id=?";
-        return Db.findFirst(sql, job_id, person_id);
-    }
+
 
     /**
      * 功能：将可能带有栅格的JSON字符串简化为多个JsonObject

src/main/resource/Sql/Collect.sql

@@ -99,8 +99,9 @@
         (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 -- 县区教育局转发给的单位完成了多少个填报工作
         -- 对于这个单位而言，它如果下发了转发任务的话，那么新的转发任务ID号是多少
-        , (select t2.job_id from t_collect_job as t2 where t2.parent_id=t1.job_id and t2.bureau_id=t1.target_id limit 1) as child_job_id
-
+        ,
+        (select t3.job_id from t_collect_job as t3 inner join t_collect_job_target as t2 on t3.job_id=t2.job_id where t3.parent_id=t1.job_id
+        and t2.current_target_type_id=1 limit 1)    as child_job_id
         from t_collect_job_target as t1
         inner join t_base_organization as t2 on t1.target_id=t2.org_id
         left join v_collect_xbgs as t3 on t1.target_id=t3.bureau_id
@@ -133,7 +134,9 @@
        (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.target_id and t2.is_finish=1) as forward_fill_count
        -- 对于这个单位而言，它如果下发了转发任务的话，那么新的转发任务ID号是多少
-       , (select t2.job_id from t_collect_job as t2 where t2.parent_id=t1.job_id and t2.bureau_id=t1.target_id limit 1) as child_job_id
+       ,
+        (select t3.job_id from t_collect_job as t3 inner join t_collect_job_target as t2 on t3.job_id=t2.job_id where t3.parent_id=t1.job_id
+        and t2.current_target_type_id=2 limit 1)    as child_job_id
         from t_collect_job_target as t1
         inner join t_sys_loginperson as t2 on t1.target_id=t2.person_id
         inner join t_collect_job as t4 on t1.job_id=t4.job_id