'commit'

src/main/java/com/dsideal/QingLong/Zjcq/Controller/ZjcqController.java

@@ -3,12 +3,14 @@ package com.dsideal.QingLong.Zjcq.Controller;
 import com.dsideal.QingLong.Interceptor.EmptyInterface;
 import com.dsideal.QingLong.Interceptor.IsLoginInterface;
 import com.dsideal.QingLong.Interceptor.IsNumericInterface;
+import com.dsideal.QingLong.Util.CommonUtil;
 import com.dsideal.QingLong.Zjcq.Model.ZjcqModel;
 import com.jfinal.aop.Before;
 import com.jfinal.core.Controller;
 import com.jfinal.ext.interceptor.GET;
 import com.jfinal.ext.interceptor.POST;
 import com.jfinal.kit.Kv;
+import com.jfinal.plugin.activerecord.Page;
 import com.jfinal.plugin.activerecord.Record;
 
 import java.util.List;
@@ -28,10 +30,10 @@ public class ZjcqController extends Controller {
     }
 
     /**
-     * 功能：创建一次验收
+     * 功能：创建一次验收(创建抽取一次专家的任务)
      *
-     * @param ys_name         验收名称
-     * @param ys_date         验收日期
+     * @param ys_name 验收名称
+     * @param ys_date 验收日期
      */
     @Before({POST.class})
     @IsLoginInterface({})
@@ -45,17 +47,30 @@ public class ZjcqController extends Controller {
 
     /**
      * 功能：抽取专家
-     * @param ys_id 验收id
-     * @param lx_ids 分类
+     *
+     * @param ys_id           验收id
+     * @param lx_ids          分类
      * @param ys_person_count 专家人数s
      */
     @Before({GET.class})
     @IsLoginInterface({})
     @EmptyInterface({"lx_ids"})
     @IsNumericInterface({"count"})
-    public void doZjcq(int ys_id,String lx_ids, int ys_person_count) {
-        List<Record> list = zm.doZjcq(ys_id,lx_ids, ys_person_count);
+    public void doZjcq(int ys_id, String lx_ids, int ys_person_count) {
+        List<Record> list = zm.doZjcq(ys_id, lx_ids, ys_person_count);
         renderJson(list);
     }
 
+    /**
+     * 功能：抽取任务列表
+     *
+     * @param page  第几页
+     * @param limit 每页多少个
+     */
+    @Before({GET.class})
+    @IsLoginInterface({})
+    public void listZjcq(int page, int limit) {
+        Page<Record> list = zm.listZjcq(page, limit);
+        renderJson(CommonUtil.renderJsonForLayUI(list));
+    }
 }

src/main/java/com/dsideal/QingLong/Zjcq/Model/ZjcqModel.java

@@ -1,6 +1,10 @@
 package com.dsideal.QingLong.Zjcq.Model;
 
+import com.dsideal.QingLong.Interceptor.IsLoginInterface;
+import com.jfinal.aop.Before;
+import com.jfinal.ext.interceptor.GET;
 import com.jfinal.plugin.activerecord.Db;
+import com.jfinal.plugin.activerecord.Page;
 import com.jfinal.plugin.activerecord.Record;
 
 import java.util.List;
@@ -36,6 +40,8 @@ public class ZjcqModel {
             r.set("ys_id", ys_id);
             Db.save("t_zhuanjia_record_detail", "ys_id,person_id", r);
         }
+        sql = "update t_zhuanjia_record set is_finish=1 where ys_id=?";
+        Db.update(sql, ys_id);
         return list;
     }
 
@@ -54,4 +60,15 @@ public class ZjcqModel {
         return record.getInt("ys_id");
     }
 
+    /**
+     * 功能：抽取任务列表
+     *
+     * @param page  第几页
+     * @param limit 每页多少个
+     */
+    public Page<Record> listZjcq(int page, int limit) {
+        String sql = " from t_zhuanjia_record order by ys_id desc";
+        Page<Record> list = Db.paginate(page, limit, "select *", sql);
+        return list;
+    }
 }