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

dsRes/src/main/java/com/dsideal/resource/Base/Controller/BaseController.java

@@ -87,7 +87,7 @@ public class BaseController extends Controller {
     /**
      * 功能：科目列表
      */
-    @Before({POST.class})
+    @Before({GET.class})
     public void listSubject(int stage_id, int page, int limit) {
         Page<Record> listPage = bm.listSubject(stage_id, page, limit);
         renderJson(RetKit.renderSuccess(listPage));

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

@@ -17,6 +17,11 @@ public class BaseModel {
         return Db.find(sql);
     }
 
+    public Record getStage(int stage_id) {
+        String sql = "select * from t_dm_stage where stage_id=?";
+        return Db.findFirst(sql, stage_id);
+    }
+
     /**
      * 功能：检查学科名称是否重复
      *
@@ -102,7 +107,13 @@ public class BaseModel {
      */
     public Page<Record> listSubject(int stage_id, int page, int limit) {
         String sql = "from t_dm_subject where stage_id=? order by sort_id";
-        return Db.paginate(page, limit, "select *", sql, stage_id);
+        Page<Record> subjectPage = Db.paginate(page, limit, "select *", sql, stage_id);
+
+        String stageName = getStage(stage_id).getStr("stage_name");
+        for (Record record : subjectPage.getList()) {
+            record.set("stage_name", stageName);
+        }
+        return subjectPage;
     }
 
     /**