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

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

@@ -664,10 +664,12 @@ public class CollectController extends Controller {
 
     /**
      * 功能：获取任务列表，支持关键字查询
+     * @param selfOrNext 是不是看自己本单位:1,还是看下一级:2
      */
     @Before({GET.class})
     @IsLoginInterface({})
-    public void getJobList(String job_name, int page, int limit) throws ParseException {
+    @IsNumericInterface({"selfOrNext"})
+    public void getJobList(String job_name, int selfOrNext, int page, int limit) throws ParseException {
         //操作人员
         String person_id = SessionKit.get(getRequest(), getResponse(), "person_id");
         //检查当前登录人员是不是发布任务的角色
@@ -676,9 +678,10 @@ public class CollectController extends Controller {
             renderJson(kvCheck);
             return;
         }
+
         //获取登录人员第一个发布任务的角色是什么
         int publish_role_id = kvCheck.getInt("publish_role_id");
-        Page<Record> list = cm.getJobList(publish_role_id, job_name, page, limit);
+        Page<Record> list = cm.getJobList(publish_role_id, selfOrNext,job_name, page, limit);
         renderJson(CommonUtil.renderJsonForLayUI(list));
     }
 

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

@@ -736,11 +736,19 @@ public class CollectModel {
      * 功能：获取任务列表，支持关键字查询
      *
      * @param job_name
+     * @param selfOrNext 是不是看自己本单位:1,还是看下一级:2
      */
-    public Page<Record> getJobList(int publish_role_id, String job_name, int page, int limit) throws ParseException {
+    public Page<Record> getJobList(int publish_role_id, int selfOrNext, String job_name, int page, int limit) throws ParseException {
         Kv kv = Kv.create();
         kv.set("publish_role_id", publish_role_id);
         if (!StrKit.isBlank(job_name)) kv.set("job_name", job_name);
+        //selfOrNext
+        if (selfOrNext == 1) {
+            kv.set("selfOrNext1", 1);
+        } else if (selfOrNext == 2) {
+            kv.set("selfOrNext2", 1);
+        }
+
         SqlPara sqlPara = Db.getSqlPara("Collect.getJobList", kv);
         Page<Record> pageRecord = Db.paginate(page, limit, sqlPara);
 
@@ -1142,10 +1150,13 @@ public class CollectModel {
                 targetSet.add(r.getStr("person_id"));
             }
             //人员
-            for (String s : personIds.split(",")) {
-                forPerson = true;
-                targetSet.add(s);
+            if (!StrKit.isBlank(personIds)) {
+                for (String s : personIds.split(",")) {
+                    forPerson = true;
+                    targetSet.add(s);
+                }
             }
+
         }
 
         if (!StrKit.isBlank(bureauIds)) {

src/main/resource/Sql/Collect.sql

@@ -8,8 +8,15 @@
         (select count(1) from t_collect_job_sheet as t2 where t2.job_id=t1.job_id) as all_sheet,
         (select count(1) from t_collect_job_target as t2 where t2.job_id=t1.job_id and t2.fill_type_id in (2,3)) as forward_count, --转发数量
         (select count(1) from t_collect_job_target as t2 where t2.job_id=t1.job_id and t2.forward_progress_xiaji=2)  as forward_finish_count --转发完成数量
-        from t_collect_job as t1 where t1.publish_role_id = #para(publish_role_id) and t1.parent_id=-1
+        from t_collect_job as t1
+        #if(selfOrNext1)
+            inner join t_collect_job_target as t2 on t1.job_id=t2.job_id and t2.target_id=t1.bureau_id
+        #end
+        #if(selfOrNext2)
+            inner join t_collect_job_target as t2 on t1.job_id=t2.job_id and t2.target_id<>t1.bureau_id
+        #end
         #if(job_name)
+        where t1.publish_role_id = #para(publish_role_id) and t1.parent_id=-1
             and t1.job_name like #para(job_name, "like")
         #end
         order by t1.job_id desc