获取积分12

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<CompetitionMembersVo> 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));
-    }
 }

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);

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;
 }

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
+@Data
-@Getter
 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;
 }

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
+@Data
-@Getter
 public class PersonalCareerVo {
 
     private static final long serialVersionUID = 1L;
-
+    @ApiModelProperty(value="总场次",required=false)
+    private Long totalCount;
     /**
      *场均得分
      */

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;
 
 }

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionMembersScoreMapper.java

@@ -64,7 +64,7 @@ public interface CompetitionMembersScoreMapper
 
     public List<CompetitionMembersScoreVo> findMembersScoreByCompetitionVsId(@Param("competitionId") Long competitionId, @Param("competitionVsId") Long competitionVsId);
 
-    PersonalCareerVo getUserScoreByUserId(@Param(value = "teamUserId") Long teamUserId);
+    CompetitionMembersScoreVo getUserScoreByUserId(@Param(value = "teamUserId") Long teamUserId);
 
     List<CompetitionMembersScore> getHonorList(@Param("competitionId") Long competitionId,@Param("userId") Long userId);
 

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<CompetitionMembersScore> getHonorList(Long competitionId, Long userId);
 

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);
 }

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);
     }
 

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;

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

@@ -122,10 +122,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
         ORDER BY sco.is_first_launch desc
     </select>
-    <select id="getUserScoreByUserId" resultType="com.ruoyi.system.domain.vo.PersonalCareerVo">
+    <select id="getUserScoreByUserId" resultType="com.ruoyi.system.domain.vo.CompetitionMembersScoreVo">
         SELECT
-            count(1) as sessions,
+            count(1) as totalCount,
-            sum(t.total_score ) /count(1) AS totalScore,
+            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,