From 9814fcebc4a80df15045554c7ba81303e77f3938 Mon Sep 17 00:00:00 2001
From: wang0018 <1007152140@qq.com>
Date: Mon, 23 Nov 2020 15:32:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8A=E4=BC=A0=E5=9B=9E?=
 =?UTF-8?q?=E6=98=BE=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ccsens/mt/bean/vo/CompeteVo.java |  3 +++
 .../com/ccsens/mt/service/CompeteService.java | 18 +++++++++----
 .../resources/mapper_dao/CompeteVideoDao.xml  | 25 +++++++++++++++++++
 3 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java b/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java
index 7408638b..64bcf444 100644
--- a/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java
+++ b/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java
@@ -525,6 +525,9 @@ public class CompeteVo {
         private Byte waiver;
         @ApiModelProperty("分数合集")
         private List<ScropList> scoreList;
+        @ApiModelProperty("分数合集")
+        private String videoPath;
+
     }
     @Data
     @ApiModel
diff --git a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java
index 4b00b528..0b3d6fa6 100644
--- a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java
+++ b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java
@@ -102,7 +102,8 @@ public class CompeteService implements ICompeteService {
     private CompetePlayerMapper competePlayerMapper;
     @Resource
     private CompeteJudgmentMapper competeJudgmentMapper;
-
+    @Resource
+    private CompeteVideoMapper competeVideoMapper;
 
     @Override
     public PageInfo<CompeteVo.TotalScoreDisplay> showResultPage(ScoreDto.ShowResultW param) {
@@ -1175,11 +1176,11 @@ public class CompeteService implements ICompeteService {
                 competeStartOrder.setRemark(param.getRemark());
                 competeStartOrderMapper.updateByPrimaryKeySelective(competeStartOrder);
             }
+            CompeteStartOrder competeStartOrder=new CompeteStartOrder();
+            competeStartOrder.setId(param.getSiteOrderId());
+            competeStartOrder.setWaiver(param.getWaiver());
+            competeStartOrderMapper.updateByPrimaryKeySelective(competeStartOrder);
             if(param.getWaiver()!=((byte)0)){
-                CompeteStartOrder competeStartOrder=new CompeteStartOrder();
-                competeStartOrder.setId(param.getSiteOrderId());
-                competeStartOrder.setWaiver(param.getWaiver());
-                competeStartOrderMapper.updateByPrimaryKeySelective(competeStartOrder);
                 for (int i = 0; i < param.getFractionsList().size(); i++) {
                     param.getFractionsList().get(i).setScore(new BigDecimal(0));
                 }
@@ -1792,6 +1793,13 @@ public class CompeteService implements ICompeteService {
 }
 
          */
+
+        CompeteVideoExample competeVideoExample=new CompeteVideoExample();
+        competeVideoExample.createCriteria().andProjectIdEqualTo(param.getProjectId()).andPlayerIdEqualTo(competeStartOrder1.getPlayerId()).andCompeteTimeIdEqualTo(param.getCompeteTimeId()).andRecStatusEqualTo((byte)0);
+        List<CompeteVideo> competeVideos = competeVideoMapper.selectByExample(competeVideoExample);
+        if(competeVideos.size()>0){
+            selScropeVo.setVideoPath(competeVideos.get(0).getVideoUrl());
+        }
         selScropeVo.setScoreList(scropLists);
         return selScropeVo;
     }
diff --git a/mt/src/main/resources/mapper_dao/CompeteVideoDao.xml b/mt/src/main/resources/mapper_dao/CompeteVideoDao.xml
index d2dbdde1..3d60b6d4 100644
--- a/mt/src/main/resources/mapper_dao/CompeteVideoDao.xml
+++ b/mt/src/main/resources/mapper_dao/CompeteVideoDao.xml
@@ -17,6 +17,21 @@
        <if test="param.signEndTime!=null">
         and  t_compete_player_look.`look_time` &lt;= #{param.signEndTime,jdbcType=TIMESTAMP}
        </if>
+        group by company_id
+
+<!--       select company_id,look_time-->
+<!--       From (-->
+<!--        select * from t_compete_player_look-->
+<!--        where `rec_status`=0-->
+<!--        <if test="param.signEndTime!=null">-->
+<!--            and  t_compete_player_look.`look_time` &lt;= #{param.signEndTime,jdbcType=TIMESTAMP}-->
+<!--        </if>-->
+<!--        ORDER BY look_time desc-->
+<!--        ) group by company id-->
+
+
+
+
     ) tcpl on tcpl.company_id=tcc.id
     where
     tct.id= #{param.id}
@@ -46,6 +61,16 @@
         <if test="param.signEndTime!=null">
             and  tall.t_sys_log.created_at 	&lt;= #{param.signEndTime,jdbcType=TIMESTAMP}
         </if>
+        GROUP BY tt.user_id
+
+<!--        select created_at as cr,user_id FROM(-->
+<!--        select * from tall.t_sys_log-->
+<!--        where `url`='/users/signin' and `rec_status`=0-->
+<!--        <if test="param.signEndTime!=null">-->
+<!--            and  tall.t_sys_log.created_at 	&lt;= #{param.signEndTime,jdbcType=TIMESTAMP}-->
+<!--        </if>-->
+<!--        ORDER BY created_at DESC ) tt-->
+<!--        GROUP BY tt.user_id-->
         ) tt on tt.`user_id`=tcj.`user_id`
         LEFT JOIN t_compete_time tct on tct.id =tcj.`compete_time_id`
         WHERE