比赛结果数据记录优化

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CompetitionResultController.java

@@ -127,7 +127,8 @@ public class CompetitionResultController extends BaseController
     {
         return toAjax(competitionResultService.deleteCompetitionResultByIds(ids));
     }
-    @ApiOperation(ApiTerminal.wxMiniProgram+"球员数据-新增、编辑")
+    @ApiOperation(ApiTerminal.wxMiniProgram+"球员数据-新增,编辑")
+    @Log(title = "赛会中球员比赛得分记录", businessType = BusinessType.UPDATE)
     @PostMapping("/insertOrUpdateMemberScore")
     @ResponseBody
     public AjaxResult insertOrUpdateMemberScore(@RequestBody CompetitionMembersScore request) throws Exception {

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionMembersScore.java

@@ -31,6 +31,16 @@ public class CompetitionMembersScore extends BaseEntity
     @Excel(name = "赛程id(competition_team_vs_team的ID)")
     private Long competitionVsId;
 
+
+    @ApiModelProperty(value = "参赛人员记录id(competition_members的ID)", required = false)
+    @Excel(name = "competition_members_id")
+    private Long competitionMembersId;
+
+
+    @ApiModelProperty(value = "competition_of_team_id(competition_of_team的主键ID)", required = false)
+    @Excel(name = "competition_of_team_id")
+    private Long competitionOfTeamId;
+
     /** 球队ID */
     @Excel(name = "球队ID")
     private Long teamId;

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

@@ -32,10 +32,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="isDeleted"    column="is_deleted"    />
         <result property="remark"    column="remark"    />
         <result property="isFirstLaunch"    column="is_first_launch"    />
+        <result property="competitionMembersId" column="competition_members_id"/>
+        <result property="competitionOfTeamId" column="competition_of_team_id"/>
     </resultMap>
 
     <sql id="selectCompetitionMembersScoreVo">
-        select id, competition_id, competition_vs_id, team_id, team_name, node_num, team_user_id, jersey_number, total_score, two_points, three_points, penalty, backboard, front_plate, back_plate, assists, snatch, block, fault, breaks, created_time, last_updated_time, created_by, modified_by, is_deleted, remark, is_first_launch from competition_members_score
+        select id, competition_id, competition_vs_id, team_id, team_name, node_num, team_user_id, jersey_number, total_score, two_points, three_points, penalty, backboard, front_plate, back_plate, assists, snatch, block, fault, breaks, created_time, last_updated_time, created_by, modified_by, is_deleted, remark, is_first_launch,competition_of_team_id,competition_members_id from competition_members_score
     </sql>
 
     <select id="selectCompetitionMembersScoreList" parameterType="CompetitionMembersScore" resultMap="CompetitionMembersScoreResult">
@@ -66,6 +68,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="modifiedBy != null  and modifiedBy != ''"> and modified_by = #{modifiedBy}</if>
             <if test="isDeleted != null "> and is_deleted = #{isDeleted}</if>
             <if test="isFirstLaunch != null "> and is_first_launch = #{isFirstLaunch}</if>
+            <if test="competitionMembersId != null "> and competition_members_id = #{competitionMembersId}</if>
+            <if test="competitionOfTeamId != null "> and competition_of_team_id = #{competitionOfTeamId}</if>
         </where>
     </select>
     
@@ -77,22 +81,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             resultType="com.ruoyi.system.domain.vo.CompetitionMembersScoreVo">
         SELECT
         sco.id,
-        vs.competition_id as competitionId,
+        vs.competition_id AS competitionId,
-        vs.id as competitionVsId,
+        vs.id AS competitionVsId,
-        vs.competition_group as competitionGroup,
+        vs.competition_group AS competitionGroup,
         team.id AS teamId,
-        member.user_id as teamUserId,
+        member.user_id AS teamUserId,
-        cm.real_name as realName,
+        member.id as competitionMembersId,
-        team.team_name as teamName,
+        member.real_name AS realName,
-        sco.node_num as nodeNum,
+        team.team_name AS teamName,
-        member.jersey_number as jerseyNumber,
+        team.id as competitionOfTeamId,
-        sco.total_score as totalScore,
+        sco.node_num AS nodeNum,
-        sco.two_points as twoPoints,
+        member.jersey_number AS jerseyNumber,
-        sco.three_points as threePoints,
+        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.front_plate AS frontPlate,
-        sco.back_plate as backPlate,
+        sco.back_plate AS backPlate,
         sco.assists,
         sco.snatch,
         sco.block,
@@ -101,11 +107,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         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
+        INNER JOIN competition_of_team team ON ( vs.main_team_id = team.id OR vs.guest_team_id = team.id )
-        left join competition_members member on team.id = member.competition_team_id and member.IS_DELETED=0
+        AND team.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 competition_members member ON team.id = member.competition_of_team_id
-        left join user_info userInfo on member.user_id = userInfo.id and userInfo.is_deleted=0
+        AND member.IS_DELETED = 0
-        left join competition_members cm on cm.user_id=userInfo.id and cm.is_deleted=0
+        LEFT JOIN competition_members_score sco ON ( vs.id = sco.competition_vs_id AND member.id = sco.competition_members_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}
@@ -197,6 +208,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isDeleted != null">is_deleted,</if>
             <if test="remark != null">remark,</if>
             <if test="isFirstLaunch != null">is_first_launch,</if>
+            <if test="competitionMembersId != null">competition_members_id,</if>
+            <if test="competitionOfTeamId != null">competition_of_team_id,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="competitionId != null">#{competitionId},</if>
@@ -225,6 +238,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isDeleted != null">#{isDeleted},</if>
             <if test="remark != null">#{remark},</if>
             <if test="isFirstLaunch != null">#{isFirstLaunch},</if>
+            <if test="competitionMembersId != null">#{competitionMembersId},</if>
+            <if test="competitionOfTeamId != null">#{competitionOfTeamId},</if>
+
          </trim>
     </insert>
 
@@ -257,6 +273,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isDeleted != null">is_deleted = #{isDeleted},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="isFirstLaunch != null">is_first_launch = #{isFirstLaunch},</if>
+            <if test="competitionMembersId != null">competition_members_id =#{competitionMembersId},</if>
+            <if test="competitionOfTeamId != null">competition_of_team_id=#{competitionOfTeamId},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -74,7 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         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
+        inner join competition_of_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 ">

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

@@ -79,7 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             t.competition_time as competitionTime,
             t.building_id as buildingId,
             t.building_name as buildingName,
-            t.competition_address as competitionAddress,
+            IFNULL(t.competition_address,b.ADDRESS) as competitionAddress,
             t.competition_group as competitionGroup,
             t.status,
             t.vs_type as vsType,
@@ -120,11 +120,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             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 competition_of_team b1 ON b1.id = t.main_team_id
-                 left join basketball_team b2 on t.guest_team_id=b2.id
+                 left join competition_of_team b2 on t.guest_team_id=b2.id
+                 left join building_info b on b.id = t.building_id
         where 1=1 AND  t.id=#{id}
           AND  t.is_deleted = 0
-            LIMIT 1
+            LIMIT 1;
     </select>
     <select id="getCompetitionSchedule" resultType="com.ruoyi.system.domain.vo.CompetitionTeamVsTeamVo">
         select