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 7ce435c5..8198731d 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 @@ -527,6 +527,9 @@ public class CompeteVo { private Byte waiver; @ApiModelProperty("分数合集") private List scoreList; + @ApiModelProperty("分数合集") + private String videoPath; + } @Data @ApiModel 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 49f97b48..648516b6 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 @@ -227,6 +227,8 @@ public class ScoreVo { private String remark; @ApiModelProperty("名次") private int rangee; + @ApiModelProperty("视频路劲") + private String videoUrl; } @Data 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 66f5a491..c5b41708 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java @@ -102,6 +102,8 @@ public class CompeteService implements ICompeteService { private CompetePlayerMapper competePlayerMapper; @Resource private CompeteJudgmentMapper competeJudgmentMapper; + @Resource + private CompeteVideoMapper competeVideoMapper; @Override @@ -1180,11 +1182,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)); } @@ -1407,8 +1409,20 @@ public class CompeteService implements ICompeteService { @Override public List countScoreCurrentSite(CompeteDto.CompeteSite params) { + Long siteId = params.getSiteId(); List countScoreCurrentSites = competeScoreDao.selectCountScoreCurrentSite(siteId); + countScoreCurrentSites.forEach(mes->{ + CompeteStartOrder competeStartOrder = competeStartOrderMapper.selectByPrimaryKey(siteId); + CompeteVideoExample competeVideoExample = new CompeteVideoExample(); + competeVideoExample.createCriteria().andProjectIdEqualTo(competeStartOrder.getProjectId()).andPlayerIdEqualTo(competeStartOrder.getPlayerId()); + List competeVideos = competeVideoMapper.selectByExample(competeVideoExample); + if(competeVideos.size()>0) { + CompeteVideo competeVideo = competeVideos.get(0); + String path = competeVideo.getVideoUrl(); + mes.setVideoUrl(path); + } + }); return countScoreCurrentSites; } @@ -1799,6 +1813,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 competeVideos = competeVideoMapper.selectByExample(competeVideoExample); + if(competeVideos.size()>0){ + selScropeVo.setVideoPath(competeVideos.get(0).getVideoUrl()); + } selScropeVo.setScoreList(scropLists); return selScropeVo; } @@ -1816,6 +1837,7 @@ public class CompeteService implements ICompeteService { @Override public PageInfo queryCountScore(ScoreDto.ShowResult param) { + log.info("计数赛成绩公示:{}", param); CompeteProject project = competeProjectMapper.selectByPrimaryKey(param.getProjectId()); log.info("查询{}项目的成绩:", project); diff --git a/mt/src/main/resources/mapper_dao/CompeteVideoDao.xml b/mt/src/main/resources/mapper_dao/CompeteVideoDao.xml index d2dbdde1..ca1fb630 100644 --- a/mt/src/main/resources/mapper_dao/CompeteVideoDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteVideoDao.xml @@ -17,6 +17,21 @@ and t_compete_player_look.`look_time` <= #{param.signEndTime,jdbcType=TIMESTAMP} + group by company_id + + + + + + + + + + + + + + ) tcpl on tcpl.company_id=tcc.id where tct.id= #{param.id} @@ -46,6 +61,16 @@ and tall.t_sys_log.created_at <= #{param.signEndTime,jdbcType=TIMESTAMP} + GROUP BY tall.t_sys_log.user_id + + + + + + + + + ) tt on tt.`user_id`=tcj.`user_id` LEFT JOIN t_compete_time tct on tct.id =tcj.`compete_time_id` WHERE