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

src/main/java/com/dsideal/FengHuang/Yp/Controller/YpController.java

@@ -34,8 +34,13 @@ public class YpController extends Controller {
      */
     @Before(GET.class)
     public void getCurrentTaskInfo() {
-        Record record = model.getCurrentTaskInfo();
+        List<Record> list = model.getCurrentTaskInfo();
-        renderJson(record);
+        if (list.size() > 0) {
+            renderJson(list.get(0));
+        } else {
+            Kv kv = Kv.by("task_id", -1);
+            renderJson(kv);
+        }
     }
 
     /**
@@ -164,7 +169,7 @@ public class YpController extends Controller {
      * @param limit
      */
     @Before(GET.class)
-    @IsNumericInterface({"task_id","bx_id", "page", "limit"})
+    @IsNumericInterface({"task_id", "bx_id", "page", "limit"})
     public void getTaskInfo(int task_id, int bx_id, int page, int limit) {
         Page<Record> list = model.getTaskInfo(task_id, bx_id, page, limit);
         renderJson(CommonUtil.renderJsonForLayUI(list));

src/main/java/com/dsideal/FengHuang/Yp/Model/YpModel.java

@@ -18,9 +18,10 @@ public class YpModel {
      *
      * @return
      */
-    public Record getCurrentTaskInfo() {
+    public List<Record> getCurrentTaskInfo() {
-        String sql = "select task_id,task_name,is_run from t_yp_task where b_use=1";
+        String sql = "select task_id,task_name,is_run from t_yp_task where b_use=1 and is_run=1";
-        return Db.findFirst(sql);
+        List<Record> list = Db.find(sql);
+        return list;
     }
 
     /**
@@ -127,9 +128,13 @@ public class YpModel {
                 if (applyCount >= limit_count) {
                     kv.set("bx_id", -3);
                     kv.set("bx_name", "人数已满！");
+                    kv.set("applyCount", applyCount);
+                    kv.set("limit_count", limit_count);
                     return kv;
                 }
                 kv.set("bx_id", bx_id);
+                kv.set("applyCount", applyCount);
+                kv.set("limit_count", limit_count);
                 kv.set("bx_name", bx_name);
                 return kv;
             }