'commit'

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

@@ -1128,15 +1128,15 @@ public class CollectModel {
      * @param limit
      */
     public Page<Record> viewJob(int job_id, String keyword, int is_finish, int forward_is_finish, int page, int limit, int fill_type_id) {
-        if (fill_type_id == 0) fill_type_id = 1;//填报任务类型：1：填报，2：转发，3：填报+转发
         Kv kv = Kv.create();
         kv.set("job_id", job_id);
         if (!StrKit.isBlank(keyword)) kv.set("keyword", keyword);
         if (is_finish != -1) kv.set("is_finish", is_finish);
 
+        //不是填报，就是转发1:填报，2：转发
+        if (fill_type_id == 0) fill_type_id = 1;//填报任务类型：1：填报，2：转发，3：填报+转发
         if (fill_type_id == 1) kv.set("fill_type_id_1", 1);
         else if (fill_type_id == 2) kv.set("fill_type_id_2", 1);
-        else if (fill_type_id == 3) kv.set("fill_type_id_3", 1);
 
         //forward_is_finish:1=转发已反馈 0：转发未反馈
         if (forward_is_finish == 0) kv.set("forward_is_finish_0", 1);

src/main/resource/Sql/Collect.sql

@@ -58,15 +58,12 @@
         #if(is_finish)
          and t2.is_finish= #para(is_finish)
         #end
-        #if(fill_type_id_1)
+        #if(fill_type_id_1) --看填报
           and t2.fill_type_id in (1,3)
         #end
-        #if(fill_type_id_2)
+        #if(fill_type_id_2) --看转发
           and t2.fill_type_id in (2,3)
         #end
-        #if(fill_type_id_3)
-          and t2.fill_type_id in (3)
-        #end
 
         and ( 1=0
             #if(forward_progress_0)
@@ -106,20 +103,17 @@
         #if(is_finish)
           and t1.is_finish=#para(is_finish)
         #end
-        #if(fill_type_id_1)
+        #if(fill_type_id_1) --看填报
           and t1.fill_type_id in (1,3)
         #end
-        #if(fill_type_id_2)
+        #if(fill_type_id_2) --看转发
           and t1.fill_type_id in (2,3)
-        #end
-        #if(fill_type_id_3)
-          and t1.fill_type_id in (3)
-        #end
-        #if(forward_is_finish_0)
-         and t1.forward_progress in (0,1)
-        #end
-        #if(forward_is_finish_1)
-         and t1.forward_progress in (2)
+           #if(forward_is_finish_0) --转发未结束
+             and t1.forward_progress in (0,1)
+           #end
+           #if(forward_is_finish_1) --转发已结束
+            and t1.forward_progress in (2)
+           #end
         #end
         #if(keyword)
          and t2.org_name like #para(keyword, "like")