From 79e467579826d91bee34d1d33ba6e1c2e22925de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=85=81=E6=9E=9E?= <3422692813@qq.com>
Date: Mon, 23 Sep 2024 17:33:10 +0800
Subject: [PATCH] =?UTF-8?q?9.23=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/cms/HitCompetitionStudentInfoMapper.xml  | 2 +-
 .../src/main/resources/mapper/cms/HitRegInfoMapper.xml        | 2 +-
 ruoyi-ui/src/views/officialWebsite/competition.vue            | 4 ++--
 ruoyi-ui/src/views/officialWebsite/contact.vue                | 1 +
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/mapper/cms/HitCompetitionStudentInfoMapper.xml b/ruoyi-admin/src/main/resources/mapper/cms/HitCompetitionStudentInfoMapper.xml
index 95b5dfc..05ba06a 100644
--- a/ruoyi-admin/src/main/resources/mapper/cms/HitCompetitionStudentInfoMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/cms/HitCompetitionStudentInfoMapper.xml
@@ -38,7 +38,7 @@
         <where>
             <if test="hitRegId != null  and hitRegId != ''"> and hit_reg_id = #{hitRegId}</if>
             <if test="stuName != null  and stuName != ''"> and stu_name like concat('%', #{stuName}, '%')</if>
-            <if test="schoolName != null  and schoolName != ''"> and school_name like concat('%', #{schoolName}, '%')</if>
+            <if test="schoolName != null  and schoolName != ''"> and school_name =  #{schoolName} </if>
             <if test="collegeName != null  and collegeName != ''"> and college_name like concat('%', #{collegeName}, '%')</if>
             <if test="major != null  and major != ''"> and major = #{major}</if>
             <if test="division != null  and division != ''"> and division = #{division}</if>
diff --git a/ruoyi-admin/src/main/resources/mapper/cms/HitRegInfoMapper.xml b/ruoyi-admin/src/main/resources/mapper/cms/HitRegInfoMapper.xml
index bc5cdaf..01b18ef 100644
--- a/ruoyi-admin/src/main/resources/mapper/cms/HitRegInfoMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/cms/HitRegInfoMapper.xml
@@ -31,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectHitRegInfoList" parameterType="HitRegInfo" resultMap="HitRegInfoResult">
         <include refid="selectHitRegInfoVo"/>
         <where>
-            <if test="schoolName != null  and schoolName != ''"> and school_name like concat('%', #{schoolName}, '%')</if>
+            <if test="schoolName != null  and schoolName != ''"> and school_name =  #{schoolName}</if>
             <if test="collegeName != null  and collegeName != ''"> and college_name like concat('%', #{collegeName}, '%')</if>
             <if test="division != null  and division != ''"> and division = #{division}</if>
             <if test="teamName != null  and teamName != ''"> and team_name like concat('%', #{teamName}, '%')</if>
diff --git a/ruoyi-ui/src/views/officialWebsite/competition.vue b/ruoyi-ui/src/views/officialWebsite/competition.vue
index a593f85..b8b0f3b 100644
--- a/ruoyi-ui/src/views/officialWebsite/competition.vue
+++ b/ruoyi-ui/src/views/officialWebsite/competition.vue
@@ -100,7 +100,7 @@
             <!-- <div class="step-box-title" style="font-size: 20px;margin-top: 8%" v-if="signUpForm.trialsScore == null">成绩仅供参考，最终选择由指导老师和领队老师做决定</div> -->
             <div class="step-box-title" style="font-size: 20px;margin-top: 8%"
               v-if="signUpForm.trialsScore != null && signUpForm.isPreliminary == false">
-              很遗憾，个人选拔赛未通过，您的个人成绩为 : {{ signUpForm.trialsScore }}</div>
+              等待领队老师确认，您的个人成绩为 : {{ signUpForm.trialsScore }}</div>
             <div style="position: absolute;left: 15%; top: 30%" v-if="signUpForm.trialsScore">
               <div style="font-size: 24px">
                 个人选拔赛成绩：
@@ -184,7 +184,7 @@
                 <el-form-item v-if="preliminaryForm.competition.includes('1')" label="盲样邮寄地址" prop="sampleAddress">
                   <el-input v-model="preliminaryForm.sampleAddress"></el-input>
                 </el-form-item>
-                <el-form-item label="附件" prop="uploadFile">
+                <el-form-item label="附件（纸质报名表盖章）" prop="uploadFile" label-width="180px">
                   <!-- <file-upload :fileSize="20" :fileType="['doc','docx','pdf','zip']" v-model="preliminaryForm.uploadFile"></file-upload> -->
                   <file-upload :fileSize="20" :fileType="['pdf']" v-model="preliminaryForm.uploadFile"></file-upload>
                 </el-form-item>
diff --git a/ruoyi-ui/src/views/officialWebsite/contact.vue b/ruoyi-ui/src/views/officialWebsite/contact.vue
index 0a1081e..8eb9194 100644
--- a/ruoyi-ui/src/views/officialWebsite/contact.vue
+++ b/ruoyi-ui/src/views/officialWebsite/contact.vue
@@ -88,6 +88,7 @@ export default {
       this.currentActive = value;
     },
     initPageData() {
+      console.log('测试')
 
       let routeParam = {
         "categoryId": this.$route.query.id,