11-20-1

mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java

@@ -491,8 +491,8 @@ public class CompeteVo {
         public BigDecimal referee0 = new BigDecimal(0);
         @ApiModelProperty("最后得分")
         public BigDecimal result = new BigDecimal(0);
-//        @ApiModelProperty("排名")
-//        public int order;
+        @ApiModelProperty("排名")
+        public int order;
     }
     @Data
     @ApiModel("项目，开始时间和比赛状态")

mt/src/main/java/com/ccsens/mt/service/CompeteService.java

@@ -109,26 +109,44 @@ public class CompeteService implements ICompeteService {
             //一个人或者一个团队得数据
             CompeteVo.TotalScoreDisplay totalScoreDisplay = new CompeteVo.TotalScoreDisplay();
             //项目名
-            CompeteProject project = competeProjectMapper.selectByPrimaryKey(competeStartOrder.getProjectId());
-            if(ObjectUtil.isNotNull(project)) {
-                totalScoreDisplay.setCompanyName(project.getName());
-            }
+//            CompeteProject project = competeProjectMapper.selectByPrimaryKey(competeStartOrder.getProjectId());
+//            if(ObjectUtil.isNotNull(project)) {
+//                totalScoreDisplay.setCompanyName(project.getName());
+//            }
             //名字
             if(competeStartOrder.getTeam().equals((byte) 0)){
-                //个人
+                //个人人名
                 CompetePlayer player = competePlayerDao.selectByPrimaryKey(competeStartOrder.getPlayerId());
                 if(ObjectUtil.isNotNull(player)) {
                     totalScoreDisplay.setPeopleName(player.getName());
+                    //个人所属团队名
+                    CompeteCompany competeCompany = competeCompanyMapper.selectByPrimaryKey(player.getCompanyId());
+                    if (ObjectUtil.isNotNull(competeCompany)){
+                        totalScoreDisplay.setCompanyName(competeCompany.getName());
+                    }
                 }
             }else {
-                //团体
+                //团体名
+                CompeteTeam competeTeam = competeTeamDao.selectByPrimaryKey(competeStartOrder.getPlayerId());
+                CompeteCompany competeCompany =competeCompanyMapper.selectByPrimaryKey(competeTeam.getCompanyId());
+                totalScoreDisplay.setCompanyName(competeCompany.getName());
+                //团队人名
                 CompeteTeamMemberExample competeTeamMemberExample = new CompeteTeamMemberExample();
-                competeTeamMemberExample.createCriteria().andCompeteTeamIdEqualTo(competeStartOrder.getPlayerId());
-                List<CompeteTeamMember> competeTeamMembersList = competeTeamMemberMapper.selectByExample(competeTeamMemberExample);
+                competeTeamMemberExample.createCriteria().andCompeteTeamIdEqualTo(competeTeam.getId());
+                List<CompeteTeamMember> competeTeamMemberList = competeTeamMemberMapper.selectByExample(competeTeamMemberExample);
                 StringBuilder stringBuilder=new StringBuilder("");
-                competeTeamMembersList.forEach(competeTeamMember -> {
-                    stringBuilder.append(competePlayerDao.selectByPrimaryKey(competeTeamMember.getPlayerId()).getName()+'、');
+                competeTeamMemberList.forEach(mes->{
+                    CompetePlayer competePlayer = competePlayerDao.selectByPrimaryKey(mes.getPlayerId());
+                    stringBuilder.append(competePlayer.getName());
                 });
+                totalScoreDisplay.setPeopleName(stringBuilder.toString());
+//                CompeteTeamMemberExample competeTeamMemberExample =new CompeteTeamMemberExample();
+//                competeTeamMemberExample.createCriteria().andCompeteTeamIdEqualTo(competeStartOrder.getPlayerId());
+//                List<CompeteTeamMember> competeTeamMembersList = competeTeamMemberMapper.selectByExample(competeTeamMemberExample);
+//                StringBuilder stringBuilder=new StringBuilder("");
+//                competeTeamMembersList.forEach(competeTeamMember -> {
+//                    stringBuilder.append(competePlayerDao.selectByPrimaryKey(competeTeamMember.getPlayerId()).getName()+'、');
+//                });
                 totalScoreDisplay.setPeopleName(stringBuilder.toString().substring(0,stringBuilder.length()));
             }
             List<CompeteVo.Result> results = competeTimeDao.selectJudgmentS(competeStartOrder.getId());
@@ -190,7 +208,12 @@ public class CompeteService implements ICompeteService {
             }
         }
 
-        return null;
+        for (int i=0; i<totalScoreDisplaysList.size();i++){
+            CompeteVo.TotalScoreDisplay totalScoreDisplay = totalScoreDisplaysList.get(i);
+                    totalScoreDisplay.setOrder(i+1);
+        }
+
+        return totalScoreDisplaysList;
     }