From 63e8b13a8177fa37d01ec6037d5073eeb6e2e089 Mon Sep 17 00:00:00 2001 From: wuyibo <771227828@qq.com> Date: Thu, 24 Aug 2023 17:53:06 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=A7=AF=E5=88=8612?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompetitionMembersController.java | 13 ++++++------- .../system/controller/WxUserController.java | 5 +++-- .../domain/vo/CompetitionMembersScoreVo.java | 2 ++ .../system/domain/vo/CompetitionMembersVo.java | 10 +++++++--- .../system/domain/vo/PersonalCareerVo.java | 7 ++++--- .../system/domain/vo/UserInfoResponse.java | 2 +- .../mapper/CompetitionMembersScoreMapper.java | 2 +- .../ICompetitionMembersScoreService.java | 2 +- .../service/ICompetitionMembersService.java | 3 +-- .../CompetitionMembersScoreServiceImpl.java | 2 +- .../impl/CompetitionMembersServiceImpl.java | 18 +++++++++++++++--- .../system/CompetitionMembersScoreMapper.xml | 9 ++++++--- 12 files changed, 48 insertions(+), 27 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CompetitionMembersController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CompetitionMembersController.java index 4abf501e..75a6669e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CompetitionMembersController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/CompetitionMembersController.java @@ -67,7 +67,12 @@ public class CompetitionMembersController extends BaseController { return AjaxResult.success(competitionMembersService.selectCompetitionMembersById(id)); } - + @ApiOperation("获取赛会中个人得分数据") + @PostMapping( "/getCompetitionUserScoreInfo") + @ResponseBody + public AjaxResult getCompetitionUserScoreInfo(@RequestBody CompetitionMembersVo entity){ + return AjaxResult.success(competitionMembersService.getCompetitionUserScoreInfo(entity)); + } /** * 新增比赛参与人员 */ @@ -108,10 +113,4 @@ public class CompetitionMembersController extends BaseController List list = competitionMembersService.getJoinCompetitionMembersPage(entity); return getDataTable(list); } - @RequiresPermissions("system:competitionMembers:query") - @GetMapping(value = "/getCompetitionUserScoreInfo/{id}") - @ApiOperation("获取赛会中个人得分数据") - private AjaxResult getCompetitionUserScoreInfo(@PathVariable("id") Long id){ - return AjaxResult.success(competitionMembersService.getCompetitionUserScoreInfo(id)); - } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/WxUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/WxUserController.java index 7fbf9187..0d04abd5 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/WxUserController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/WxUserController.java @@ -12,6 +12,7 @@ import javax.servlet.http.HttpServletResponse; import com.github.pagehelper.util.StringUtil; import com.ruoyi.common.swagger.apiConstants.ApiTerminal; import com.ruoyi.system.domain.UserRole; +import com.ruoyi.system.domain.vo.CompetitionMembersScoreVo; import com.ruoyi.system.domain.vo.PersonalCareerVo; import com.ruoyi.system.domain.vo.UserInfoResponse; import com.ruoyi.system.service.ICompetitionMembersScoreService; @@ -192,9 +193,9 @@ public class WxUserController extends BaseController } //个人生涯 - PersonalCareerVo personalCareerVo = competitionMembersScoreService.getUserScoreByUserId(userId); + CompetitionMembersScoreVo personalCareerVo = competitionMembersScoreService.getUserScoreByUserId(userId); if(personalCareerVo==null){ - personalCareerVo = new PersonalCareerVo(); + personalCareerVo = new CompetitionMembersScoreVo(); } userInfoResponse.setPersonalCareerVo(personalCareerVo); return AjaxResult.success(userInfoResponse); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CompetitionMembersScoreVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CompetitionMembersScoreVo.java index 4fd20469..5eb3f56a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CompetitionMembersScoreVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CompetitionMembersScoreVo.java @@ -11,4 +11,6 @@ import lombok.Data; @Data public class CompetitionMembersScoreVo extends CompetitionMembersScore { private String realName; + private Long totalCount; + private Long avgCountScore; } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CompetitionMembersVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CompetitionMembersVo.java index 0cd9e24c..9893cfef 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CompetitionMembersVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CompetitionMembersVo.java @@ -2,6 +2,7 @@ package com.ruoyi.system.domain.vo; import com.ruoyi.system.domain.CompetitionMembers; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; import lombok.Getter; import lombok.Setter; @@ -17,8 +18,7 @@ import lombok.Setter; * @date : 2020年08月07日 */ @ApiModel(value = "比赛参与人员Vo") -@Setter -@Getter +@Data public class CompetitionMembersVo extends CompetitionMembers { private static final long serialVersionUID = 1L; @@ -56,9 +56,13 @@ public class CompetitionMembersVo extends CompetitionMembers { @ApiModelProperty(value = "短信验证码", required = false) private String captcha; + @ApiModelProperty(value = "赛会名称", required = false) + private String competitionName; + @ApiModelProperty(value = "球队名称", required = false) + private String teamName; @ApiModelProperty(value="个人生涯",required=false) - private PersonalCareerVo personalCareerVo; + private CompetitionMembersScoreVo personalCareerVo; @ApiModelProperty(value="赛会个人得分",required=false) private CompetitionMembersScoreVo competitionMemberScore; } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/PersonalCareerVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/PersonalCareerVo.java index 10731b7d..9bb5cef8 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/PersonalCareerVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/PersonalCareerVo.java @@ -1,6 +1,7 @@ package com.ruoyi.system.domain.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; import lombok.Getter; import lombok.Setter; @@ -10,12 +11,12 @@ import java.math.BigDecimal; * */ @ApiModel(value = "个人生涯Vo") -@Setter -@Getter +@Data public class PersonalCareerVo { private static final long serialVersionUID = 1L; - + @ApiModelProperty(value="总场次",required=false) + private Long totalCount; /** *场均得分 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/UserInfoResponse.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/UserInfoResponse.java index 1a2de0ac..649047dc 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/UserInfoResponse.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/UserInfoResponse.java @@ -56,6 +56,6 @@ public class UserInfoResponse extends WxUser { @Setter @Getter @ApiModelProperty(value="个人生涯",required=false) - private PersonalCareerVo personalCareerVo; + private CompetitionMembersScoreVo personalCareerVo; } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionMembersScoreMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionMembersScoreMapper.java index 0657f4b9..b78763c5 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionMembersScoreMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionMembersScoreMapper.java @@ -64,7 +64,7 @@ public interface CompetitionMembersScoreMapper public List findMembersScoreByCompetitionVsId(@Param("competitionId") Long competitionId, @Param("competitionVsId") Long competitionVsId); - PersonalCareerVo getUserScoreByUserId(@Param(value = "teamUserId") Long teamUserId); + CompetitionMembersScoreVo getUserScoreByUserId(@Param(value = "teamUserId") Long teamUserId); List getHonorList(@Param("competitionId") Long competitionId,@Param("userId") Long userId); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionMembersScoreService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionMembersScoreService.java index 622780cd..9bdbed32 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionMembersScoreService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionMembersScoreService.java @@ -61,7 +61,7 @@ public interface ICompetitionMembersScoreService */ public int deleteCompetitionMembersScoreById(Long id); - PersonalCareerVo getUserScoreByUserId(Long userId); + CompetitionMembersScoreVo getUserScoreByUserId(Long userId); List getHonorList(Long competitionId, Long userId); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionMembersService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionMembersService.java index 5a1e0cd2..a16a8a52 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionMembersService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ICompetitionMembersService.java @@ -52,6 +52,7 @@ public interface ICompetitionMembersService */ public int deleteCompetitionMembersByIds(Long[] ids); + public CompetitionMembersVo getCompetitionUserScoreInfo(CompetitionMembersVo vo); /** * 删除比赛参与人员信息 * @@ -65,6 +66,4 @@ public interface ICompetitionMembersService void deleteByMembers(Long competitionId, Long teamOfId); void bindCompetitionMembersByTel(Long userId, String telephone); - - CompetitionMembersVo getCompetitionUserScoreInfo(Long id); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionMembersScoreServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionMembersScoreServiceImpl.java index 53d22755..c8e144cb 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionMembersScoreServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionMembersScoreServiceImpl.java @@ -95,7 +95,7 @@ public class CompetitionMembersScoreServiceImpl implements ICompetitionMembersSc } @Override - public PersonalCareerVo getUserScoreByUserId(Long userId) { + public CompetitionMembersScoreVo getUserScoreByUserId(Long userId) { return competitionMembersScoreMapper.getUserScoreByUserId(userId); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionMembersServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionMembersServiceImpl.java index ec0bc3c1..4303f818 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionMembersServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionMembersServiceImpl.java @@ -4,9 +4,13 @@ import java.util.List; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; +import com.ruoyi.system.domain.Competition; +import com.ruoyi.system.domain.CompetitionOfTeam; import com.ruoyi.system.domain.vo.CompetitionMembersScoreVo; import com.ruoyi.system.domain.vo.CompetitionMembersVo; import com.ruoyi.system.domain.vo.PersonalCareerVo; +import com.ruoyi.system.mapper.CompetitionMapper; +import com.ruoyi.system.mapper.CompetitionOfTeamMapper; import com.ruoyi.system.service.ICompetitionMembersScoreService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -26,7 +30,11 @@ public class CompetitionMembersServiceImpl implements ICompetitionMembersService @Autowired private CompetitionMembersMapper competitionMembersMapper; @Autowired + private CompetitionOfTeamMapper competitionOfTeamMapper; + @Autowired private ICompetitionMembersScoreService competitionMembersScoreService; + @Autowired + private CompetitionMapper competitionMapper; /** * 查询比赛参与人员 @@ -116,17 +124,21 @@ public class CompetitionMembersServiceImpl implements ICompetitionMembersService } @Override - public CompetitionMembersVo getCompetitionUserScoreInfo(Long id) { + public CompetitionMembersVo getCompetitionUserScoreInfo(CompetitionMembersVo vo) { CompetitionMembersVo membersVo = new CompetitionMembersVo(); - CompetitionMembers member = competitionMembersMapper.selectCompetitionMembersById(id); + CompetitionMembers member = competitionMembersMapper.selectCompetitionMembersById(vo.getId()); BeanUtil.copyProperties(member,membersVo); + Competition competition = competitionMapper.selectCompetitionById(member.getCompetitionId()); + membersVo.setCompetitionName(competition.getCompetitionName()); + CompetitionOfTeam team = competitionOfTeamMapper.selectCompetitionOfTeamById(member.getCompetitionOfTeamId()); + membersVo.setTeamName(team.getTeamName()); //获取本赛会的个人得分情况 CompetitionMembersScoreVo membersScoreVo = competitionMembersScoreService.getThisCompetitionScore(member.getCompetitionId(),member.getId()); membersVo.setCompetitionMemberScore(membersScoreVo); //如果没有登录我们的系统的人员就无法统计职业生涯 if(ObjectUtil.isNotEmpty(member.getUserId())){ //个人生涯 - PersonalCareerVo personalCareerVo = competitionMembersScoreService.getUserScoreByUserId(member.getUserId()); + CompetitionMembersScoreVo personalCareerVo = competitionMembersScoreService.getUserScoreByUserId(member.getUserId()); membersVo.setPersonalCareerVo(personalCareerVo); } return membersVo; 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 03f4e671..68546c30 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 @@ -122,10 +122,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ORDER BY sco.is_first_launch desc - SELECT - count(1) as sessions, - sum(t.total_score ) /count(1) AS totalScore, + count(1) as totalCount, + sum(t.total_score ) /count(1) AS avgCountScore, + sum(t.total_score ) AS totalScore, sum(t.two_points) /count(1) as twoPoints, sum(t.three_points)/count(1) as threePoints, sum(t.penalty)/count(1) as penalty, @@ -179,6 +180,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" any_value(member.real_name) as realName, any_value(score.team_id) as teamId, any_value(team.TEAM_NAME) as teamName, + count(1) as totalCount, + IFNULL(sum(score.total_score),0) /count(1) AS avgCountScore, IFNULL(sum(score.total_score),0) AS totalScore, IFNULL(sum(score.two_points),0) AS twoPoints, IFNULL(sum(score.penalty),0) AS penalty,