赛会结果数据展示

ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionMembersScoreMapper.xml

@@ -73,7 +73,48 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectCompetitionMembersScoreVo"/>
         where id = #{id}
     </select>
-        
+    <select id="findMembersScoreByCompetitionVsId"
+            resultType="com.ruoyi.system.domain.CompetitionMembersScore">
+        SELECT
+        DISTINCT
+        sco.id,
+        vs.competition_id as competitionId,
+        vs.id as competitionVsId,
+        vs.competition_group as competitionGroup,
+        team.id AS teamId,
+        member.user_id as teamUserId,
+        cm.real_name as realName,
+        team.team_name as teamName,
+        sco.node_num as nodeNum,
+        member.jersey_number as jerseyNumber,
+        sco.total_score as totalScore,
+        sco.two_points as twoPoints,
+        sco.three_points as threePoints,
+        sco.penalty,
+        sco.backboard,
+        sco.front_plate as frontPlate,
+        sco.back_plate as backPlate,
+        sco.assists,
+        sco.snatch,
+        sco.block,
+        sco.fault,
+        sco.breaks,
+        IFNULL(sco.is_first_launch,0) AS isFirstLaunch
+        FROM
+        competition_team_vs_team vs
+        inner join basketball_team team on (vs.main_team_id=team.id or vs.guest_team_id=team.id) and team.IS_DELETED=0
+        left join competition_members member on team.id = member.competition_team_id and member.IS_DELETED=0
+        left join competition_members_score sco on (vs.id=sco.competition_vs_id and member.user_id = sco.team_user_id) and sco.is_deleted=0
+        left join user_info userInfo on member.user_id = userInfo.id and userInfo.is_deleted=0
+        left join competition_members cm on cm.user_id=userInfo.id and cm.is_deleted=0
+        WHERE 1 = 1  AND vs.is_deleted = 0
+        <if test="competitionId != null ">
+            AND  vs.competition_Id = #{competitionId}
+        </if>
+        <if test="competitionVsId != null ">
+            AND  vs.id = #{competitionVsId}
+        </if>
+    </select>
     <insert id="insertCompetitionMembersScore" parameterType="CompetitionMembersScore" useGeneratedKeys="true" keyProperty="id">
         insert into competition_members_score
         <trim prefix="(" suffix=")" suffixOverrides=",">

ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionResultMapper.xml

@@ -59,7 +59,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectCompetitionResultVo"/>
         where id = #{id}
     </select>
-        
+    <select id="findByCompetitionVsId" resultType="com.ruoyi.system.domain.CompetitionResult">
+        select rs.id,
+        vs.competition_id as competitionId,
+        vs.id as competitionVsId,
+        vs.competition_group as competitionGroup,
+        team.id as teamId,
+        team.team_name as teamName,
+        rs.one_node_score as oneNodeScore,
+        rs.two_node_score as twoNodeScore,
+        rs.three_node_score as threeNodeScore,
+        rs.four_node_score as fourNodeScore,
+        rs.five_node_score as fiveNodeScore,
+        rs.six_node_score as sixNodeScore,
+        rs.integral
+        from competition_team_vs_team vs
+        inner join basketball_team team on (vs.main_team_id=team.id or vs.guest_team_id=team.id) and team.IS_DELETED=0
+        left join competition_Result rs on (rs.competition_vs_id=vs.id and team.id = rs.team_id) and rs.is_deleted=0
+        where 1=1 and vs.is_deleted=0
+        <if test="competitionId != null ">
+            AND  vs.competition_Id = #{competitionId}
+        </if>
+        <if test="competitionVsId != null ">
+            AND  vs.id = #{competitionVsId}
+        </if>
+    </select>
+
     <insert id="insertCompetitionResult" parameterType="CompetitionResult" useGeneratedKeys="true" keyProperty="id">
         insert into competition_result
         <trim prefix="(" suffix=")" suffixOverrides=",">

ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionTeamVsTeamMapper.xml

@@ -66,6 +66,66 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectCompetitionTeamVsTeamVo"/>
         where id = #{id}
     </select>
+    <select id="getCompetitionById" resultType="com.ruoyi.system.domain.vo.CompetitionTeamVsTeamVo">
+        select
+            t.id as id,
+            t.competition_id as competitionId,
+            t.main_team_id as mainTeamId,
+            b1.TEAM_NAME as mainTeamName,
+            b1.team_logo as mainTeamLogo,
+            t.guest_team_id as guestTeamId,
+            b2.TEAM_NAME as guestTeamName,
+            b2.team_logo as guestTeamLogo,
+            t.competition_time as competitionTime,
+            t.building_id as buildingId,
+            t.building_name as buildingName,
+            t.competition_address as competitionAddress,
+            t.competition_group as competitionGroup,
+            t.status,
+            t.vs_type as vsType,
+            t.created_time as createdTime,
+            t.last_updated_time as lastUpdatedTime,
+            t.created_by as createdBy,
+            t.modified_by as modifiedBy,
+            t.main_team_score as mainTeamScore,
+            t.guest_team_score as guestTeamScore,
+            t.is_deleted as isDeleted,
+            DATE_FORMAT(t.competition_time,'%Y-%m-%d') as competitionDate,
+            CASE dayofweek(t.competition_time)
+                WHEN 1 THEN
+                    '星期日'
+                WHEN 2 THEN
+                    '星期一'
+                WHEN 3 THEN
+                    '星期二'
+                WHEN 4 THEN
+                    '星期三'
+                WHEN 5 THEN
+                    '星期四'
+                WHEN 6 THEN
+                    '星期五'
+                WHEN 7 THEN
+                    '星期六'
+                END as weekDayName,
+            CASE t.status
+                WHEN -1 THEN
+                    '已取消'
+                WHEN 0 THEN
+                    '报名中'
+                WHEN 1 THEN
+                    '比赛中'
+                WHEN 2 THEN
+                    '已结束'
+                END as statusName,
+            DATE_FORMAT(t.competition_time,'%H:%i') AS theTime,
+            t.remark as remark
+        from competition_team_vs_team t
+                 LEFT JOIN basketball_team b1 ON b1.id = t.main_team_id
+                 left join basketball_team b2 on t.guest_team_id=b2.id
+        where 1=1 AND  t.id=#{id}
+          AND  t.is_deleted = 0
+            LIMIT 1
+    </select>
 
     <insert id="insertCompetitionTeamVsTeam" parameterType="CompetitionTeamVsTeam" useGeneratedKeys="true" keyProperty="id">
         insert into competition_team_vs_team