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

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

@@ -945,7 +945,7 @@ public class CollectController extends Controller {
     @IsLoginInterface({})
     @IsNumericInterface({"is_finish"})
     @LayUiPageInfoInterface({"page", "limit"})
-    public void viewJobList(String keyword, int is_finish, int page, int limit, int fill_type_id, int forward_progress) {
+    public void viewJobList(String keyword, int is_finish, int page, int limit, int fill_type_id, String forward_progress) {
         //注意：要求前端必须传入新增参数：forward_progress,fill_type_id,如果不关心转为概念，需传入-1,不可以是0!
         if (fill_type_id <= 0) fill_type_id = 1;//填报是默认值
 

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

@@ -1050,7 +1050,7 @@ public class CollectModel {
      * @param page             第几页
      * @param forward_progress 转发是不是已完成上交回复
      */
-    public Page<Record> viewJobList(String bureau_id, String keyword, int is_finish, int page, int limit, int fill_type_id, int forward_progress) {
+    public Page<Record> viewJobList(String bureau_id, String keyword, int is_finish, int page, int limit, int fill_type_id, String forward_progress) {
         Kv kv = Kv.create();
         kv.set("bureau_id", bureau_id);
         if (!StrKit.isBlank(keyword)) kv.set("keyword", keyword);
@@ -1059,7 +1059,13 @@ public class CollectModel {
         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);
-        kv.set("forward_progress", forward_progress);
+
+        for (String s : forward_progress.split(",")) {
+            if (s.equals("0")) kv.set("forward_progress_0", 1);
+            if (s.equals("1")) kv.set("forward_progress_1", 1);
+            if (s.equals("2")) kv.set("forward_progress_2", 1);
+        }
+
 
         SqlPara sqlPara = Db.getSqlPara("Collect.viewJobList", kv);
         Page<Record> pageRecord = Db.paginate(page, limit, sqlPara);

src/main/resource/Sql/Collect.sql

@@ -67,8 +67,14 @@
         #if(fill_type_id_3)
           and t2.fill_type_id in (3)
         #end
-        #if(forward_progress)
-          and t2.forward_progress=#para(forward_progress)
+        #if(forward_progress_0)
+          and t2.forward_progress=0
+        #end
+        #if(forward_progress_1)
+          and (t2.forward_progress=1 or t2.forward_progress=2)
+        #end
+        #if(forward_progress_2)
+          and t2.forward_progress=2
         #end
         #if(keyword)
          and t1.job_name like #para(keyword, "like")