Merge branch 'pt' of https://dd.tall.wiki/gitea/ccsens_wiki/ccsenscloud into pt

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

@@ -492,8 +492,8 @@ public class CompeteVo {
         public BigDecimal referee0 = new BigDecimal(0);
         @ApiModelProperty("最后得分")
         public BigDecimal result = new BigDecimal(0);
-//        @ApiModelProperty("排名")
+        @ApiModelProperty("排名")
-//        public int order;
+        public int order;
     }
 
     @Data

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

@@ -225,6 +225,8 @@ public class ScoreVo {
         private BigDecimal finalScore;
         @ApiModelProperty("备注")
         private String remark;
+        @ApiModelProperty("名词")
+        private int rangee;
     }
 
 }

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

@@ -113,26 +113,44 @@ public class CompeteService implements ICompeteService {
             //一个人或者一个团队得数据
             CompeteVo.TotalScoreDisplay totalScoreDisplay = new CompeteVo.TotalScoreDisplay();
             //项目名
-            CompeteProject project = competeProjectMapper.selectByPrimaryKey(competeStartOrder.getProjectId());
+//            CompeteProject project = competeProjectMapper.selectByPrimaryKey(competeStartOrder.getProjectId());
-            if(ObjectUtil.isNotNull(project)) {
+//            if(ObjectUtil.isNotNull(project)) {
-                totalScoreDisplay.setCompanyName(project.getName());
+//                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 {
-                //团体
+                //团体名
-                CompeteTeamMemberExample competeTeamMemberExample =new CompeteTeamMemberExample();
+                CompeteTeam competeTeam = competeTeamDao.selectByPrimaryKey(competeStartOrder.getPlayerId());
-                competeTeamMemberExample.createCriteria().andCompeteTeamIdEqualTo(competeStartOrder.getPlayerId());
+                CompeteCompany competeCompany =competeCompanyMapper.selectByPrimaryKey(competeTeam.getCompanyId());
-                List<CompeteTeamMember> competeTeamMembersList = competeTeamMemberMapper.selectByExample(competeTeamMemberExample);
+                totalScoreDisplay.setCompanyName(competeCompany.getName());
+                //团队人名
+                CompeteTeamMemberExample competeTeamMemberExample = new CompeteTeamMemberExample();
+                competeTeamMemberExample.createCriteria().andCompeteTeamIdEqualTo(competeTeam.getId());
+                List<CompeteTeamMember> competeTeamMemberList = competeTeamMemberMapper.selectByExample(competeTeamMemberExample);
                 StringBuilder stringBuilder=new StringBuilder("");
-                competeTeamMembersList.forEach(competeTeamMember -> {
+                competeTeamMemberList.forEach(mes->{
-                    stringBuilder.append(competePlayerDao.selectByPrimaryKey(competeTeamMember.getPlayerId()).getName()+'、');
+                    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());
@@ -194,7 +212,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;
     }
 
 

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

@@ -266,7 +266,6 @@ public class ExcelService implements IExcelService {
            jiaolianHang.setValue(String.valueOf(jiaolianName));
            jiaolianList.add(jiaolianHang);
            biao.add(jiaolianList);
-
            //再放运动员
            StringBuffer  yDYLN=new StringBuffer("");
            competePlayerList.forEach(cpL->{

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

@@ -675,7 +675,7 @@ public class ProvinceService implements IProvinceService {
                     }
                 }
             }else {
-                //查找当前单位是否已经报名此项目内的改组别
+                //查找当前单位是否已经报名此项目内的gai组别
                 CompeteTeam competeTeam;
                 CompeteTeamExample teamExample = new CompeteTeamExample();
                 teamExample.createCriteria().andProjectIdEqualTo(competeProject.getId()).andCompanyIdEqualTo(param.getCompanyId())

mt/src/main/resources/mapper_dao/CompeteScoreDao.xml

@@ -105,6 +105,7 @@
     and tcso.id =#{siteId}
   </select>
     <select id="queryCountScoreAll" resultType="com.ccsens.mt.bean.vo.ScoreVo$CountScoreCurrentSite">
+        SELECT @rownum:=@rownum+1 as rangee, b.* from (
         SELECT
         g.group_name as groupName,
         c.`name` as companyName,
@@ -127,7 +128,7 @@
         o.project_id = #{projectId}
         and
         o.rec_status = 0
-        ORDER BY s.final_score DESC
+        ORDER BY s.final_score DESC) b,(select @rownum:=0) a
     </select>
   <select id="queryCountScoreAllByTeam" resultType="com.ccsens.mt.bean.vo.ScoreVo$CountScoreCurrentSite">
         SELECT
@@ -149,7 +150,7 @@
         LEFT JOIN t_compete_group g on t.group_remark = g.group_remark and t.gender_group = g.sex
         LEFT JOIN t_compete_count_score s on s.site_order_id = o.id and s.rec_status = 0
         WHERE
-        o.project_id = 2011
+        o.project_id = #{projectId}
         and
         o.rec_status = 0
         GROUP BY o.id