From e6d3ba305ac8302ce739e186eed04786a7079c2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=8D=81=E4=B8=89?= <1633489380@qq.com>
Date: Sat, 11 Oct 2025 17:15:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E6=B2=BB=E5=8C=BA?=
 =?UTF-8?q?=E5=A5=96=E5=AD=A6=E9=87=91=E7=9A=84=E8=8E=B7=E5=8F=96=E4=BD=93?=
 =?UTF-8?q?=E6=B5=8B=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CYJS-APP                                     |  1 +
 src/views/comprehensive/knzzZzqApply/stu.vue | 46 ++++++++++----------
 2 files changed, 24 insertions(+), 23 deletions(-)
 create mode 160000 CYJS-APP

diff --git a/CYJS-APP b/CYJS-APP
new file mode 160000
index 0000000..e8aceb1
--- /dev/null
+++ b/CYJS-APP
@@ -0,0 +1 @@
+Subproject commit e8aceb16e90845cd0956b314a98b2f814159b8a2
diff --git a/src/views/comprehensive/knzzZzqApply/stu.vue b/src/views/comprehensive/knzzZzqApply/stu.vue
index 7e91aa3..ab14646 100644
--- a/src/views/comprehensive/knzzZzqApply/stu.vue
+++ b/src/views/comprehensive/knzzZzqApply/stu.vue
@@ -250,7 +250,7 @@
 import { boolImg, CheckImgExists, isEmpty, fullLoading } from "@/api/helpFunc";
 import { getTokenKeySessionStorage as getToken } from "@/utils/auth";
 
-import {listOwnSportScore} from "@/api/comprehensive/biyeapply";
+import {selectTestStu} from "@/api/stuCQS/info-fill/sportTest";
 import { getDicts } from "@/api/system/dict/data";
 import { listDisciplinaryApplication } from "@/api/routine/disciplinaryApplication";
 import { getOwnStuScoreMajorRank } from "@/api/comprehensive/biyeapply";
@@ -395,7 +395,7 @@ export default {
       async checkAllConditions() {
         try {
           const [sportResult, disciplinaryResult, scoreResult] = await Promise.all([
-            this.fetchSportScoreData(),
+            this.fetchTestScoreData(),
             this.fetchcfwjc(),
             this.fetchcjpm()
           ]);
@@ -405,27 +405,27 @@ export default {
           this.applyV = false;
         }
       },
-      async fetchSportScoreData() {
-        const res = await listOwnSportScore().catch(() => {
-          this.$message.info("体能测试数据获取失败");
-          return { code: 500, data: [] };
-        });
-        if (res.code === 200 && res.data && res.data.length > 1) {
-          const sportScore = res.data[res.data.length - 1].sportScore;
-          if (sportScore >= 60) {
-            return true;
-          } else if (sportScore === 0) {
-            this.$message.info("当前学年没有您的体能成绩");
-            return false;
-          } else {
-            this.$message.info("您的体能成绩不达标");
-            return false;
-          }
-        } else {
-          this.$message.info("请先完成体能测试");
-          return false;
-        }
-      },
+        async fetchTestScoreData() {
+            const res = await selectTestStu().catch(() => {
+                this.$message.info("体能测试数据获取失败");
+                return { code: 500, rows: [] };
+            });
+            if (res.code === 200 && res.rows && res.rows.length > 0) {
+                const testScore = res.rows[res.rows.length - 1].testScore;
+                if (testScore >= 60) {
+                    return true;
+                } else if (testScore === 0) {
+                    this.$message.info("没有您的体能成绩");
+                    return false;
+                } else {
+                    this.$message.info("您的体能成绩不达标");
+                    return false;
+                }
+            } else {
+                this.$message.info("请先完成体能测试");
+                return false;
+            }
+        },
       async fetchcfwjc() {
         try {
           const response1 = await getDicts('rt_penalty_status');