From 075409bc9a3d019956d08fedf7d54d115979eb22 Mon Sep 17 00:00:00 2001 From: wuyibo <771227828@qq.com> Date: Thu, 13 Jul 2023 14:54:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AF=94=E8=B5=9B=E7=BB=93=E6=9E=9C=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E8=AE=B0=E5=BD=95=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompetitionResultController.java | 3 +- .../domain/CompetitionMembersScore.java | 10 ++++ .../system/CompetitionMembersScoreMapper.xml | 58 ++++++++++++------- .../mapper/system/CompetitionResultMapper.xml | 2 +- .../system/CompetitionTeamVsTeamMapper.xml | 9 +-- 5 files changed, 56 insertions(+), 26 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CompetitionResultController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CompetitionResultController.java index 4b1835ef..12b442ef 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CompetitionResultController.java +++ b/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 { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionMembersScore.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionMembersScore.java index b354dd31..1331a7ee 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/CompetitionMembersScore.java +++ b/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; diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionMembersScoreMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionMembersScoreMapper.xml index 1c4ed713..f0c436ea 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionMembersScoreMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionMembersScoreMapper.xml @@ -32,10 +32,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + - 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 @@ -77,35 +81,42 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" resultType="com.ruoyi.system.domain.vo.CompetitionMembersScoreVo"> SELECT sco.id, - vs.competition_id as competitionId, - vs.id as competitionVsId, - vs.competition_group as competitionGroup, + 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, + member.user_id AS teamUserId, + member.id as competitionMembersId, + member.real_name AS realName, + team.team_name AS teamName, + team.id as competitionOfTeamId, + 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.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 + 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 + 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_members member ON team.id = member.competition_of_team_id + AND member.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 AND vs.competition_Id = #{competitionId} @@ -197,6 +208,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" is_deleted, remark, is_first_launch, + competition_members_id, + competition_of_team_id, #{competitionId}, @@ -225,6 +238,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{isDeleted}, #{remark}, #{isFirstLaunch}, + #{competitionMembersId}, + #{competitionOfTeamId}, + @@ -257,6 +273,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" is_deleted = #{isDeleted}, remark = #{remark}, is_first_launch = #{isFirstLaunch}, + competition_members_id =#{competitionMembersId}, + competition_of_team_id=#{competitionOfTeamId}, where id = #{id} diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionResultMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionResultMapper.xml index 42398ec2..ad9c6f45 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionResultMapper.xml +++ b/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 diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionTeamVsTeamMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionTeamVsTeamMapper.xml index 3fa40085..71318972 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionTeamVsTeamMapper.xml +++ b/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 basketball_team b2 on t.guest_team_id=b2.id + LEFT JOIN competition_of_team b1 ON b1.id = t.main_team_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;