'commit'

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

@@ -968,7 +968,8 @@ public class CollectController extends Controller {
     @IsLoginInterface({})
     @IsNumericInterface({"job_id", "is_finish"})
     @LayUiPageInfoInterface({"page", "limit"})
-    public void viewJob(int job_id, String keyword, int is_finish, int forward_is_finish, int query_type_id, int page, int limit, int fill_type_id) {
+    public void viewJob(int job_id, String keyword, int is_finish, int forward_is_finish,
+                        int query_type_id, int page, int limit, int fill_type_id) {
         if (fill_type_id == 0) fill_type_id = 1;//填报任务类型：1：填报，2：转发，3：填报+转发
         //forward_is_finish:1=转发已反馈 0：转发未反馈
         Page<Record> list = cm.viewJob(job_id, keyword, is_finish, forward_is_finish, query_type_id, page, limit, fill_type_id);

src/main/resource/Sql/Collect.sql

@@ -148,22 +148,22 @@
         inner join t_collect_job as t4 on t1.job_id=t4.job_id
         where t1.job_id=#para(job_id)
             #if(is_finish)
-          and t1.is_finish=#para(is_finish)
+                and t1.is_finish=#para(is_finish)
             #end
             #if(fill_type_id_1) --看填报
-          and t1.fill_type_id in (1,3)
+                and t1.fill_type_id in (1,3)
             #end
             #if(fill_type_id_2) --看转发
-          and t1.fill_type_id in (2,3)
-            #if(forward_is_finish_0) --转发未结束
-          and t1.forward_progress_xiaji in (0,1)
-            #end
-            #if(forward_is_finish_1) --转发已结束
-          and t1.forward_progress_xiaji in (2)
-            #end
+                and t1.fill_type_id in (2,3)
+                #if(forward_is_finish_0) --转发未结束
+                    and t1.forward_progress_xiaji in (0,1)
+                #end
+                #if(forward_is_finish_1) --转发已结束
+                    and t1.forward_progress_xiaji in (2)
+                #end
             #end
             #if(keyword)
-          and t2.person_name like #para(keyword, "like")
+                and t2.person_name like #para(keyword, "like")
             #end
         order by t1.is_finish desc,t2.person_name
     #end