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 aab17222..4abf501e 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
@@ -108,4 +108,10 @@ 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));
+    }
 }
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 371fffa8..0cd9e24c 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
@@ -57,16 +57,8 @@ public class CompetitionMembersVo extends CompetitionMembers {
     @ApiModelProperty(value = "短信验证码", required = false)
     private String captcha;
 
-    @ApiModelProperty(value="身高",required=false)
-    private java.math.BigDecimal height;
-
-
-    @ApiModelProperty(value="体重",required=false)
-    private java.math.BigDecimal weight;
-
-    /**
-     *球队位置【字典】
-     */
-    @ApiModelProperty(value="球队位置【字典】",required=false)
-    private String teamPosition;
+    @ApiModelProperty(value="个人生涯",required=false)
+    private PersonalCareerVo personalCareerVo;
+    @ApiModelProperty(value="赛会个人得分",required=false)
+    private CompetitionMembersScoreVo competitionMemberScore;
 }
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 6f0922ca..0657f4b9 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
@@ -67,4 +67,6 @@ public interface CompetitionMembersScoreMapper
     PersonalCareerVo getUserScoreByUserId(@Param(value = "teamUserId") Long teamUserId);
 
     List<CompetitionMembersScore> getHonorList(@Param("competitionId") Long competitionId,@Param("userId") Long userId);
+
+    CompetitionMembersScoreVo getThisCompetitionScore(@Param("competitionId") Long competitionId,@Param("competitionMembersId") Long competitionMembersId);
 }
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 ca0f3fc7..622780cd 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
@@ -2,6 +2,7 @@ package com.ruoyi.system.service;
 
 import java.util.List;
 import com.ruoyi.system.domain.CompetitionMembersScore;
+import com.ruoyi.system.domain.vo.CompetitionMembersScoreVo;
 import com.ruoyi.system.domain.vo.PersonalCareerVo;
 
 /**
@@ -63,4 +64,6 @@ public interface ICompetitionMembersScoreService
     PersonalCareerVo getUserScoreByUserId(Long userId);
 
     List<CompetitionMembersScore> getHonorList(Long competitionId, Long userId);
+
+    CompetitionMembersScoreVo getThisCompetitionScore(Long competitionId, Long competitionMembersId);
 }
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 4a6e4845..5a1e0cd2 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
@@ -65,4 +65,6 @@ 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 3a8db869..53d22755 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
@@ -2,6 +2,7 @@ package com.ruoyi.system.service.impl;
 
 import java.util.List;
 
+import com.ruoyi.system.domain.vo.CompetitionMembersScoreVo;
 import com.ruoyi.system.domain.vo.PersonalCareerVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -102,4 +103,9 @@ public class CompetitionMembersScoreServiceImpl implements ICompetitionMembersSc
     public List<CompetitionMembersScore> getHonorList(Long competitionId, Long userId) {
         return competitionMembersScoreMapper.getHonorList(competitionId,userId);
     }
+
+    @Override
+    public CompetitionMembersScoreVo getThisCompetitionScore(Long competitionId, Long competitionMembersId) {
+        return competitionMembersScoreMapper.getThisCompetitionScore(competitionId,competitionMembersId);
+    }
 }
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 d1ffab2f..ec0bc3c1 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
@@ -2,7 +2,12 @@ package com.ruoyi.system.service.impl;
 
 import java.util.List;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+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.service.ICompetitionMembersScoreService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.system.mapper.CompetitionMembersMapper;
@@ -20,6 +25,8 @@ public class CompetitionMembersServiceImpl implements ICompetitionMembersService
 {
     @Autowired
     private CompetitionMembersMapper competitionMembersMapper;
+    @Autowired
+    private ICompetitionMembersScoreService competitionMembersScoreService;
 
     /**
      * 查询比赛参与人员
@@ -107,4 +114,21 @@ public class CompetitionMembersServiceImpl implements ICompetitionMembersService
     public void bindCompetitionMembersByTel(Long userId, String telephone) {
         competitionMembersMapper.bindCompetitionMembersByTel(userId,telephone);
     }
+
+    @Override
+    public CompetitionMembersVo getCompetitionUserScoreInfo(Long id) {
+        CompetitionMembersVo membersVo = new CompetitionMembersVo();
+        CompetitionMembers member = competitionMembersMapper.selectCompetitionMembersById(id);
+        BeanUtil.copyProperties(member,membersVo);
+        //获取本赛会的个人得分情况
+        CompetitionMembersScoreVo membersScoreVo = competitionMembersScoreService.getThisCompetitionScore(member.getCompetitionId(),member.getId());
+        membersVo.setCompetitionMemberScore(membersScoreVo);
+        //如果没有登录我们的系统的人员就无法统计职业生涯
+        if(ObjectUtil.isNotEmpty(member.getUserId())){
+            //个人生涯
+            PersonalCareerVo 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 b9ba3a83..03f4e671 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
@@ -174,6 +174,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         GROUP BY
         score.competition_members_id
     </select>
+    <select id="getThisCompetitionScore" resultType="com.ruoyi.system.domain.vo.CompetitionMembersScoreVo">
+        SELECT
+        any_value(member.real_name) as realName,
+        any_value(score.team_id) as teamId,
+        any_value(team.TEAM_NAME) as teamName,
+        IFNULL(sum(score.total_score),0) AS totalScore,
+        IFNULL(sum(score.two_points),0) AS twoPoints,
+        IFNULL(sum(score.penalty),0) AS penalty,
+        IFNULL(sum(score.backboard),0) AS backboard,
+        IFNULL(sum(score.front_plate),0) AS frontPlate,
+        IFNULL(sum(score.back_plate),0) AS backPlate,
+        IFNULL(sum(score.three_Points),0) AS threePoints,
+        IFNULL(sum(score.assists),0) AS assists,
+        IFNULL(sum(score.snatch),0) AS snatch,
+        IFNULL(sum(score.block),0) AS block,
+        IFNULL(sum(score.fault),0) AS fault,
+        IFNULL(sum(score.breaks),0) AS breaks
+        FROM competition_members_score score
+        LEFT JOIN competition_members member on score.competition_members_id = member.id and member.is_deleted=0
+        LEFT JOIN competition_of_team team on score.team_id = team.id and team.IS_DELETED=0
+        WHERE score.is_deleted = 0
+        <if test="competitionId != null ">
+            AND score.competition_id = #{competitionId}
+        </if>
+        <if test="competitionMembersId != null ">
+            AND  score.competition_members_id = #{competitionMembersId}
+        </if>
+    </select>
     <insert id="insertCompetitionMembersScore" parameterType="CompetitionMembersScore" useGeneratedKeys="true" keyProperty="id">
         insert into competition_members_score
         <trim prefix="(" suffix=")" suffixOverrides=",">