From 659a1cc67cf9fbe1f1a522e2e2e4aeaaac8a6b88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Fri, 21 Apr 2023 16:05:09 +0800 Subject: [PATCH 1/2] 'commit' --- src/main/java/com/dsideal/FengHuang/Yp/Model/YpModel.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/com/dsideal/FengHuang/Yp/Model/YpModel.java b/src/main/java/com/dsideal/FengHuang/Yp/Model/YpModel.java index 61ca5c8..3193dd7 100644 --- a/src/main/java/com/dsideal/FengHuang/Yp/Model/YpModel.java +++ b/src/main/java/com/dsideal/FengHuang/Yp/Model/YpModel.java @@ -127,9 +127,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; } From 245874bc456e63ba013c0ac7bdf17e4718a54f20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Fri, 21 Apr 2023 16:09:23 +0800 Subject: [PATCH 2/2] 'commit' --- .../dsideal/FengHuang/Yp/Controller/YpController.java | 11 ++++++++--- .../java/com/dsideal/FengHuang/Yp/Model/YpModel.java | 7 ++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/dsideal/FengHuang/Yp/Controller/YpController.java b/src/main/java/com/dsideal/FengHuang/Yp/Controller/YpController.java index 0a00e0a..5621cef 100644 --- a/src/main/java/com/dsideal/FengHuang/Yp/Controller/YpController.java +++ b/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(); - renderJson(record); + List list = model.getCurrentTaskInfo(); + 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 list = model.getTaskInfo(task_id, bx_id, page, limit); renderJson(CommonUtil.renderJsonForLayUI(list)); diff --git a/src/main/java/com/dsideal/FengHuang/Yp/Model/YpModel.java b/src/main/java/com/dsideal/FengHuang/Yp/Model/YpModel.java index 3193dd7..3ab2511 100644 --- a/src/main/java/com/dsideal/FengHuang/Yp/Model/YpModel.java +++ b/src/main/java/com/dsideal/FengHuang/Yp/Model/YpModel.java @@ -18,9 +18,10 @@ public class YpModel { * * @return */ - public Record getCurrentTaskInfo() { - String sql = "select task_id,task_name,is_run from t_yp_task where b_use=1"; - return Db.findFirst(sql); + public List getCurrentTaskInfo() { + String sql = "select task_id,task_name,is_run from t_yp_task where b_use=1 and is_run=1"; + List list = Db.find(sql); + return list; } /**