'commit'

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

@@ -968,12 +968,13 @@ public class CollectController extends Controller {
      * @param page             第几页
      * @param limit            每页多少个
      * @param forward_progress 转发进度 0：待转发，1：已转发，2：已回复上级
+     * @param target_type_id   1：单位，2：人员
      */
     @Before({GET.class})
     @IsLoginInterface({})
     @IsNumericInterface({"is_finish"})
     @LayUiPageInfoInterface({"page", "limit"})
-    public void viewJobList(String keyword, int is_finish, int page, int limit, int fill_type_id, String forward_progress) {
+    public void viewJobList(String keyword, int is_finish, int page, int limit, int fill_type_id, int target_type_id, String forward_progress) {
         //操作人员
         String person_id = SessionKit.get(getRequest(), getResponse(), "person_id");
         //根据人员ID，获取人员所在的单位ID
@@ -981,7 +982,7 @@ public class CollectController extends Controller {
         Record rs = personModel.getLoginInfoByPersonId(person_id);
         String bureau_id = rs.get("bureau_id");
 
-        Page<Record> list = cm.viewJobList(bureau_id, keyword, is_finish, page, limit, fill_type_id, forward_progress);
+        Page<Record> list = cm.viewJobList(bureau_id, keyword, is_finish, page, limit, fill_type_id,target_type_id, forward_progress);
         renderJson(CommonUtil.renderJsonForLayUI(list));
     }
 
@@ -1170,7 +1171,7 @@ public class CollectController extends Controller {
         }
 
         //通过检查
-        int job_id = cm.addFormJob(target_type_id,bureau_id, person_id, publish_role_id, job_name, table_name, json);
+        int job_id = cm.addFormJob(target_type_id, bureau_id, person_id, publish_role_id, job_name, table_name, json);
         Map<String, Object> map = new HashMap<>();
         map.put("success", true);
         map.put("message", "保存成功!");

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

@@ -1295,8 +1295,9 @@ public class CollectModel {
      * @param limit            每页多少个
      * @param page             第几页
      * @param forward_progress 转发是不是已完成上交回复
+     * @param target_type_id   1:单位，2：人员
      */
-    public Page<Record> viewJobList(String bureau_id, String keyword, int is_finish, int page, int limit, int fill_type_id, String forward_progress) {
+    public Page<Record> viewJobList(String bureau_id, String keyword, int is_finish, int page, int limit, int fill_type_id, int target_type_id, String forward_progress) {
         Kv kv = Kv.create();
         kv.set("bureau_id", bureau_id);
         if (!StrKit.isBlank(keyword)) kv.set("keyword", keyword);
@@ -1315,6 +1316,8 @@ public class CollectModel {
             kv.set("idList", idList);
         }
 
+        if(target_type_id>0) kv.set("target_type_id",target_type_id);
+
         SqlPara sqlPara = Db.getSqlPara("Collect.viewJobList", kv);
         Page<Record> pageRecord = Db.paginate(page, limit, sqlPara);
 

src/main/resource/Sql/Collect.sql

@@ -62,6 +62,9 @@
         #if(keyword)
          and t1.job_name like #para(keyword, "like")
         #end
+        #if(target_type_id)
+         and t2.target_type_id=#para(target_type_id)
+        #end
         order by t1.job_id desc
     #end
     -- 任务列表 (个人)