dianliang/school_website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

9.23更新

Browse Source
This commit is contained in:
许允枞 2024-09-23 17:33:10 +08:00
parent ed99549b99
commit 79e4675798
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/resources/mapper/cms/HitCompetitionStudentInfoMapper.xml
View File

@ -38,7 +38,7 @@
<where> <where>
<if test="hitRegId != null and hitRegId != ''"> and hit_reg_id = #{hitRegId}</if> <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="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="collegeName != null and collegeName != ''"> and college_name like concat('%', #{collegeName}, '%')</if>
<if test="major != null and major != ''"> and major = #{major}</if> <if test="major != null and major != ''"> and major = #{major}</if>
<if test="division != null and division != ''"> and division = #{division}</if> <if test="division != null and division != ''"> and division = #{division}</if>

2
ruoyi-admin/src/main/resources/mapper/cms/HitRegInfoMapper.xml
View File

@ -31,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectHitRegInfoList" parameterType="HitRegInfo" resultMap="HitRegInfoResult"> <select id="selectHitRegInfoList" parameterType="HitRegInfo" resultMap="HitRegInfoResult">
<include refid="selectHitRegInfoVo"/> <include refid="selectHitRegInfoVo"/>
<where> <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="collegeName != null and collegeName != ''"> and college_name like concat('%', #{collegeName}, '%')</if>
<if test="division != null and division != ''"> and division = #{division}</if> <if test="division != null and division != ''"> and division = #{division}</if>
<if test="teamName != null and teamName != ''"> and team_name like concat('%', #{teamName}, '%')</if> <if test="teamName != null and teamName != ''"> and team_name like concat('%', #{teamName}, '%')</if>

4
ruoyi-ui/src/views/officialWebsite/competition.vue
View File

@ -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">成绩仅供参考，最终选择由指导老师和领队老师做决定</div> -->
<div class="step-box-title" style="font-size: 20px;margin-top: 8%" <div class="step-box-title" style="font-size: 20px;margin-top: 8%"
v-if="signUpForm.trialsScore != null && signUpForm.isPreliminary == false"> 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="position: absolute;left: 15%; top: 30%" v-if="signUpForm.trialsScore">
<div style="font-size: 24px"> <div style="font-size: 24px">
个人选拔赛成绩： 个人选拔赛成绩：
@ -184,7 +184,7 @@
<el-form-item v-if="preliminaryForm.competition.includes('1')" label="盲样邮寄地址" prop="sampleAddress"> <el-form-item v-if="preliminaryForm.competition.includes('1')" label="盲样邮寄地址" prop="sampleAddress">
<el-input v-model="preliminaryForm.sampleAddress"></el-input> <el-input v-model="preliminaryForm.sampleAddress"></el-input>
</el-form-item> </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="['doc','docx','pdf','zip']" v-model="preliminaryForm.uploadFile"></file-upload> -->
<file-upload :fileSize="20" :fileType="['pdf']" v-model="preliminaryForm.uploadFile"></file-upload> <file-upload :fileSize="20" :fileType="['pdf']" v-model="preliminaryForm.uploadFile"></file-upload>
</el-form-item> </el-form-item>

1
ruoyi-ui/src/views/officialWebsite/contact.vue
View File

@ -88,6 +88,7 @@ export default {
this.currentActive = value; this.currentActive = value;
}, },
initPageData() { initPageData() {
console.log('测试')
let routeParam = { let routeParam = {
"categoryId": this.$route.query.id, "categoryId": this.$route.query.id,