From 29b1de74fe2b885909063c52ebd022417010efb8 Mon Sep 17 00:00:00 2001
From: "Lihong@123456" <1090591095@qq.com>
Date: Thu, 19 Nov 2020 17:58:59 +0800
Subject: [PATCH] 11-19-2

---
 mt/src/main/java/com/ccsens/mt/bean/vo/ScoreVo.java      | 2 ++
 mt/src/main/java/com/ccsens/mt/service/ExcelService.java | 1 -
 mt/src/main/resources/mapper_dao/CompeteScoreDao.xml     | 5 +++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/mt/src/main/java/com/ccsens/mt/bean/vo/ScoreVo.java b/mt/src/main/java/com/ccsens/mt/bean/vo/ScoreVo.java
index c2ce6cbe..cb516aa6 100644
--- a/mt/src/main/java/com/ccsens/mt/bean/vo/ScoreVo.java
+++ b/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;
     }
 
 }
diff --git a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java
index b01ab21a..5a7e1ff7 100644
--- a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java
+++ b/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->{
diff --git a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml
index 3e762612..02bfbd9c 100644
--- a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml
+++ b/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