'commit'

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

@@ -979,7 +979,7 @@ public class CollectController extends Controller {
     @IsLoginInterface({})
     @IsNumericInterface({"is_finish"})
     @LayUiPageInfoInterface({"page", "limit"})
-    @EmptyInterface({"queryTypeIds","forward_progress_xiaji","forward_progress_bendanwei"})
+    @EmptyInterface({"queryTypeIds", "forward_progress_xiaji", "forward_progress_bendanwei"})
     public void viewJobList(String keyword, int is_finish, int page, int limit, String queryTypeIds,
                             String forward_progress_xiaji, String forward_progress_bendanwei) {
         //操作人员
@@ -993,39 +993,6 @@ public class CollectController extends Controller {
         renderJson(CommonUtil.renderJsonForLayUI(list));
     }
 
-    /**
-     * 功能: 任务发布者，查看发布的任务填充情况(人员)
-     *
-     * @param job_id 任务ID
-     */
-    @Before({GET.class})
-    @IsLoginInterface({})
-    @IsNumericInterface({"job_id"})
-    public void viewJobPerson(int job_id) {
-        //操作人员
-        String person_id = SessionKit.get(getRequest(), getResponse(), "person_id");
-        Record record = cm.viewJobPerson(person_id, job_id);
-        renderJson(record);
-    }
-
-    /**
-     * 功能：查看我该填报或者我已填报的任务列表(人员)
-     *
-     * @param keyword   关键字
-     * @param is_finish 是不是已完成填报
-     * @param page      第几页
-     * @param limit     每页多少个
-     */
-    @Before({GET.class})
-    @IsLoginInterface({})
-    @IsNumericInterface({"is_finish"})
-    @LayUiPageInfoInterface({"page", "limit"})
-    public void viewJobListPerson(String keyword, int is_finish, int page, int limit) {
-        //操作人员
-        String person_id = SessionKit.get(getRequest(), getResponse(), "person_id");
-        Page<Record> list = cm.viewJobListPerson(person_id, keyword, is_finish, page, limit);
-        renderJson(CommonUtil.renderJsonForLayUI(list));
-    }
 
     /***** 以下为Form表单式填报模块   *********************************/
 
@@ -1627,7 +1594,7 @@ public class CollectController extends Controller {
     /**
      * 功能：转发任务我看下级单位都提交过来了，我可以向上级汇报了
      *
-     * @param job_id    任务ID
+     * @param job_id 任务ID
      */
     @Before({POST.class, RepeatIntercetpor.class})
     @IsLoginInterface({})
@@ -1881,4 +1848,39 @@ public class CollectController extends Controller {
         Page<Record> list = cm.getClassList(bureau_id, nj_id, keyword, page, limit);
         renderJson(CommonUtil.renderJsonForLayUI(list));
     }
+
+
+    /**
+     * 功能: 任务发布者，查看发布的任务填充情况(人员)
+     *
+     * @param job_id 任务ID
+     */
+    @Before({GET.class})
+    @IsLoginInterface({})
+    @IsNumericInterface({"job_id"})
+    public void viewJobPerson(int job_id) {
+        //操作人员
+        String person_id = SessionKit.get(getRequest(), getResponse(), "person_id");
+        Record record = cm.viewJobPerson(person_id, job_id);
+        renderJson(record);
+    }
+
+    /**
+     * 功能：查看我该填报或者我已填报的任务列表(人员)
+     *
+     * @param keyword   关键字
+     * @param is_finish 是不是已完成填报
+     * @param page      第几页
+     * @param limit     每页多少个
+     */
+    @Before({GET.class})
+    @IsLoginInterface({})
+    @IsNumericInterface({"is_finish"})
+    @LayUiPageInfoInterface({"page", "limit"})
+    public void viewJobListPerson(String keyword, int is_finish, int page, int limit) {
+        //操作人员
+        String person_id = SessionKit.get(getRequest(), getResponse(), "person_id");
+        Page<Record> list = cm.viewJobListPerson(person_id, keyword, is_finish, page, limit);
+        renderJson(CommonUtil.renderJsonForLayUI(list));
+    }
 }

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

@@ -2461,4 +2461,14 @@ public class CollectModel {
         Page<Record> pageRecord = Db.paginate(page, limit, sqlPara);
         return pageRecord;
     }
+    /**
+     * 功能：获取人员任务访问列表
+     * @param keyword
+     * @param is_finish
+     * @param page
+     * @param limit
+     */
+    public void viewJobListForPerson(String keyword, int is_finish, int page, int limit){
+
+    }
 }