From 94f45692f7b88cbe245c1eaeb7872292d927515d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Fri, 27 Sep 2024 08:43:23 +0800 Subject: [PATCH] 'commit' --- .idea/workspace.xml | 7 +++-- .../Base/Controller/BaseController.java | 16 +++++----- .../resource/Base/Model/BaseModel.java | 30 ++++++++++++------- 3 files changed, 32 insertions(+), 21 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 0c416a64..f069022e 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -5,8 +5,9 @@ - - + + + diff --git a/dsRes/src/main/java/com/dsideal/resource/Base/Controller/BaseController.java b/dsRes/src/main/java/com/dsideal/resource/Base/Controller/BaseController.java index 6712455b..40734afe 100644 --- a/dsRes/src/main/java/com/dsideal/resource/Base/Controller/BaseController.java +++ b/dsRes/src/main/java/com/dsideal/resource/Base/Controller/BaseController.java @@ -88,9 +88,9 @@ public class BaseController extends Controller { * 功能：科目列表 */ @Before({GET.class}) - @IsNumericInterface({"stage_id", "page", "limit"}) - public void listSubject(int stage_id, int page, int limit) { - Page listPage = bm.listSubject(stage_id, page, limit); + @IsNumericInterface({"pageNum", "pageSize"}) + public void listSubject(int stage_id, int pageNum, int pageSize) { + Page listPage = bm.listSubject(stage_id, pageNum, pageSize); renderJson(RetKit.renderSuccess(listPage)); } @@ -170,13 +170,13 @@ public class BaseController extends Controller { * 功能：版本列表 * * @param stage_id - * @param page - * @param limit + * @param pageNum + * @param pageSize */ @Before({GET.class}) - @IsNumericInterface({"stage_id", "page", "limit"}) - public void listScheme(int stage_id, int page, int limit) { - Page listPage = bm.listScheme(stage_id, page, limit); + @IsNumericInterface({"pageNum", "pageSize"}) + public void listScheme(int stage_id, int pageNum, int pageSize) { + Page listPage = bm.listScheme(stage_id, pageNum, pageSize); renderJson(RetKit.renderSuccess(listPage)); } diff --git a/dsRes/src/main/java/com/dsideal/resource/Base/Model/BaseModel.java b/dsRes/src/main/java/com/dsideal/resource/Base/Model/BaseModel.java index ad499548..2c748532 100644 --- a/dsRes/src/main/java/com/dsideal/resource/Base/Model/BaseModel.java +++ b/dsRes/src/main/java/com/dsideal/resource/Base/Model/BaseModel.java @@ -101,13 +101,18 @@ public class BaseModel { * 功能：获取学科列表 * * @param stage_id - * @param page - * @param limit + * @param pageNum + * @param pageSize * @return */ - public Page listSubject(int stage_id, int page, int limit) { - String sql = "from t_dm_subject where stage_id=? order by sort_id"; - Page subjectPage = Db.paginate(page, limit, "select *", sql, stage_id); + public Page listSubject(int stage_id, int pageNum, int pageSize) { + String sql; + if (stage_id == 0) { + sql = "from t_dm_subject order by sort_id"; + } else { + sql = "from t_dm_subject where stage_id=? order by sort_id"; + } + Page subjectPage = Db.paginate(pageNum, pageSize, "select *", sql, stage_id); String stageName = getStage(stage_id).getStr("stage_name"); for (Record record : subjectPage.getList()) { @@ -196,13 +201,18 @@ public class BaseModel { * 功能:获取教学方案列表 * * @param stage_id - * @param page - * @param limit + * @param pageNum + * @param pageSize * @return */ - public Page listScheme(int stage_id, int page, int limit) { - String sql = "from t_resource_scheme where stage_id=? limit ?,?"; - Page subjectPage = Db.paginate(page, limit, "select *", sql, stage_id); + public Page listScheme(int stage_id, int pageNum, int pageSize) { + String sql; + if (stage_id == 0) { + sql = "from t_resource_scheme limit ?,?"; + } else { + sql = "from t_resource_scheme where stage_id=? limit ?,?"; + } + Page subjectPage = Db.paginate(pageNum, pageSize, "select *", sql, stage_id); return subjectPage; }