'commit'

.idea/workspace.xml

@@ -5,8 +5,9 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="8a61ce26-c938-4ad4-aa09-565c63cde7d7" name="更改" comment="">
-      <change beforePath="$PROJECT_DIR$/dsBuild/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/dsBuild/pom.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/dsBuild/src/main/java/Util/K8sClientTest.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/dsRes/src/main/java/com/dsideal/resource/Base/Controller/BaseController.java" beforeDir="false" afterPath="$PROJECT_DIR$/dsRes/src/main/java/com/dsideal/resource/Base/Controller/BaseController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/dsRes/src/main/java/com/dsideal/resource/Base/Model/BaseModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/dsRes/src/main/java/com/dsideal/resource/Base/Model/BaseModel.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -93,7 +94,7 @@
       <option name="presentableId" value="Default" />
       <updated>1727339918298</updated>
       <workItem from="1727339920435" duration="293000" />
-      <workItem from="1727340224328" duration="1570000" />
+      <workItem from="1727340224328" duration="3122000" />
     </task>
     <servers />
   </component>

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"})
+    @IsNumericInterface({"pageNum", "pageSize"})
-    public void listSubject(int stage_id, int page, int limit) {
+    public void listSubject(int stage_id, int pageNum, int pageSize) {
-        Page<Record> listPage = bm.listSubject(stage_id, page, limit);
+        Page<Record> 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 pageNum
-     * @param limit
+     * @param pageSize
      */
     @Before({GET.class})
-    @IsNumericInterface({"stage_id", "page", "limit"})
+    @IsNumericInterface({"pageNum", "pageSize"})
-    public void listScheme(int stage_id, int page, int limit) {
+    public void listScheme(int stage_id, int pageNum, int pageSize) {
-        Page<Record> listPage = bm.listScheme(stage_id, page, limit);
+        Page<Record> listPage = bm.listScheme(stage_id, pageNum, pageSize);
         renderJson(RetKit.renderSuccess(listPage));
     }
 

dsRes/src/main/java/com/dsideal/resource/Base/Model/BaseModel.java

@@ -101,13 +101,18 @@ public class BaseModel {
      * 功能：获取学科列表
      *
      * @param stage_id
-     * @param page
+     * @param pageNum
-     * @param limit
+     * @param pageSize
      * @return
      */
-    public Page<Record> listSubject(int stage_id, int page, int limit) {
+    public Page<Record> listSubject(int stage_id, int pageNum, int pageSize) {
-        String sql = "from t_dm_subject where stage_id=? order by sort_id";
+        String sql;
-        Page<Record> subjectPage = Db.paginate(page, limit, "select *", sql, stage_id);
+        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<Record> 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 pageNum
-     * @param limit
+     * @param pageSize
      * @return
      */
-    public Page<Record> listScheme(int stage_id, int page, int limit) {
+    public Page<Record> listScheme(int stage_id, int pageNum, int pageSize) {
-        String sql = "from t_resource_scheme where stage_id=? limit ?,?";
+        String sql;
-        Page<Record> subjectPage = Db.paginate(page, limit, "select *", sql, stage_id);
+        if (stage_id == 0) {
+            sql = "from t_resource_scheme  limit ?,?";
+        } else {
+            sql = "from t_resource_scheme where stage_id=? limit ?,?";
+        }
+        Page<Record> subjectPage = Db.paginate(pageNum, pageSize, "select *", sql, stage_id);
         return subjectPage;
     }