From 1e5dff69d14e0377b4f604b8572ffae141104c23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=85=81=E6=9E=9E?= <3422692813@qq.com>
Date: Tue, 18 Mar 2025 08:53:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/HitRegistrationTeachInfoMapper.java |  1 +
 .../service/impl/HitRegInfoServiceImpl.java    |  4 ++--
 .../cms/HitRegistrationTeachInfoMapper.xml     |  6 ++++++
 .../src/views/officialWebsite/competition.vue  | 18 ++++++++++++++----
 4 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/mapper/HitRegistrationTeachInfoMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/mapper/HitRegistrationTeachInfoMapper.java
index 9a6826f..69900e9 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/cms/mapper/HitRegistrationTeachInfoMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/mapper/HitRegistrationTeachInfoMapper.java
@@ -30,6 +30,7 @@ public interface HitRegistrationTeachInfoMapper  extends BaseMapper<HitRegistrat
      * @return 教师信息
      */
     public HitRegistrationTeachInfo selectHitRegistrationTeachInfoByUserId(@Param("userId") Long userId,@Param("year") String year);
+    public HitRegistrationTeachInfo selectHitRegistrationTeachInfoByUserIdNoYear(@Param("userId") Long userId);
 
     /**
      * 查询教师信息列表
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitRegInfoServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitRegInfoServiceImpl.java
index 0e7764b..e996d59 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitRegInfoServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/cms/service/impl/HitRegInfoServiceImpl.java
@@ -109,12 +109,12 @@ public class HitRegInfoServiceImpl implements IHitRegInfoService {
             for (HitRegInfoUser regInfoUser : hitRegInfoUsers) {
                 switch (regInfoUser.getType()) {
                     case "3": {
-                        HitRegistrationTeachInfo hitRegistrationTeachInfo = teachInfoMapper.selectHitRegistrationTeachInfoByUserId(regInfoUser.getUserId(), hitRegInfo.getYear());
+                        HitRegistrationTeachInfo hitRegistrationTeachInfo = teachInfoMapper.selectHitRegistrationTeachInfoByUserIdNoYear(regInfoUser.getUserId());
                         regInfo.setLdTeacher(hitRegistrationTeachInfo);
                         break;
                     }
                     case "2": {
-                        HitRegistrationTeachInfo hitRegistrationTeachInfo = teachInfoMapper.selectHitRegistrationTeachInfoByUserId(regInfoUser.getUserId(), hitRegInfo.getYear());
+                        HitRegistrationTeachInfo hitRegistrationTeachInfo = teachInfoMapper.selectHitRegistrationTeachInfoByUserIdNoYear(regInfoUser.getUserId());
                         regInfo.getZdTeacher().add(hitRegistrationTeachInfo);
                         break;
                     }
diff --git a/ruoyi-admin/src/main/resources/mapper/cms/HitRegistrationTeachInfoMapper.xml b/ruoyi-admin/src/main/resources/mapper/cms/HitRegistrationTeachInfoMapper.xml
index bed95b2..cab17e8 100644
--- a/ruoyi-admin/src/main/resources/mapper/cms/HitRegistrationTeachInfoMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/cms/HitRegistrationTeachInfoMapper.xml
@@ -57,6 +57,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select * from hit_registration_teach_info
         where user_id = #{userId} and create_time like concat(#{year},'%')
 
+    </select>
+    <select id="selectHitRegistrationTeachInfoByUserIdNoYear"
+            resultType="com.ruoyi.common.core.domain.HitRegistrationTeachInfo">
+        select * from hit_registration_teach_info
+        where user_id = #{userId}
+
     </select>
     <select id="selectSchoolName" resultType="java.util.Map">
         select school_name schoolName
diff --git a/ruoyi-ui/src/views/officialWebsite/competition.vue b/ruoyi-ui/src/views/officialWebsite/competition.vue
index cef6943..92b42d3 100644
--- a/ruoyi-ui/src/views/officialWebsite/competition.vue
+++ b/ruoyi-ui/src/views/officialWebsite/competition.vue
@@ -100,7 +100,7 @@
                   </el-form-item>
 
                   <el-form-item>
-                    <el-button type="primary" @click="trialsSubmitForm">提交</el-button>
+                    <el-button type="primary" style="z-index: 99999" @click="trialsSubmitForm">提交</el-button>
                   </el-form-item>
                 </el-form>
               </div>
@@ -503,7 +503,7 @@ import {
   getTeamMate,
   agreeTeam,
   refuseTeam,
-  editRegInfo, editCompetitionStudentInfo, updateRegInfo
+  editRegInfo, editCompetitionStudentInfo, updateRegInfo, editTeam
 } from '@/api/officialWebsite/registerStudent'
 import { getTab, getbanner } from '@/api/gw/home'
 import { getToken } from '@/utils/auth'
@@ -714,7 +714,11 @@ export default {
       })
     },
     fileSubmit() {
-      editRegInfo(this.preliminaryForm.hitRegInfo).then(res => {
+      let data = {
+        id: this.preliminaryForm.hitRegInfo.id,
+        dsFile: this.preliminaryForm.hitRegInfo.dsFile,
+      }
+      editTeam(data).then(res => {
         this.$modal.msgSuccess('成功')
         this.fetchRegistrationInformation()
       })
@@ -970,6 +974,7 @@ export default {
   display: flex;
   align-items: center;
   justify-content: center;
+  z-index: 9;
 
   color: #fff;
   position: fixed;
@@ -991,6 +996,7 @@ export default {
   bottom: 200px;
   border-radius: 8px;
   cursor: pointer;
+  z-index: 9;
 }
 
 /* .container {
@@ -1446,6 +1452,8 @@ export default {
   box-sizing: border-box;
   padding: 15px;
   text-align: center;
+  position: relative;
+  z-index: 9;
 }
 
 .titel_ {
@@ -1578,6 +1586,8 @@ h3 {
 }
 
 .tabber-box1 {
+  position: relative;
+  z-index: 9;
   width: 100%;
   box-sizing: border-box;
   padding: 15px;
@@ -1637,7 +1647,7 @@ h3 {
   left: 0; /* 确保元素从页面左侧开始 */
   background-image: url("../../assets/images/bottom_.png");
   background-repeat: no-repeat;
-  //z-index: -1;
+  z-index: 0;
   background-size: cover;
   transition: all 1s linear;
 }