wsy182/RuoYi-Cloud
1
1
Fork 0
mirror of https://gitee.com/y_project/RuoYi-Cloud.git synced 2026-01-26 11:51:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

赛会

Browse Source
This commit is contained in:
wuyibo
2022-11-16 17:57:56 +08:00
parent 7cc1e86d71
commit 8c7b52353c
5 changed files with 217 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CompetitionResultVo.java
View File

@@ -15,5 +15,5 @@ import java.util.List;
@Data
public class CompetitionResultVo extends CompetitionResult {
@ApiModelProperty(value = "客队队员数据", required = false)
private List<CompetitionMembersScore> membersScoreList;
private List<CompetitionMembersScoreVo> membersScoreList;
}

3
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/CompetitionMembersScoreMapper.java
View File

@@ -2,6 +2,7 @@ package com.ruoyi.system.mapper;
import java.util.List;
import com.ruoyi.system.domain.CompetitionMembersScore;
import com.ruoyi.system.domain.vo.CompetitionMembersScoreVo;
import org.apache.ibatis.annotations.Param;
/**
@@ -60,5 +61,5 @@ public interface CompetitionMembersScoreMapper
*/
public int deleteCompetitionMembersScoreByIds(Long[] ids);
public List<CompetitionMembersScore> findMembersScoreByCompetitionVsId(@Param("competitionId") Long competitionId,@Param("competitionVsId") Long competitionVsId);
public List<CompetitionMembersScoreVo> findMembersScoreByCompetitionVsId(@Param("competitionId") Long competitionId, @Param("competitionVsId") Long competitionVsId);
}

13
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionTeamVsTeamServiceImpl.java
View File

@@ -9,10 +9,7 @@ import java.util.stream.Stream;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.system.domain.CompetitionMembersScore;
import com.ruoyi.system.domain.CompetitionResult;
import com.ruoyi.system.domain.vo.CompetitionResultVo;
import com.ruoyi.system.domain.vo.CompetitionTeamVsTeamVo;
import com.ruoyi.system.domain.vo.CompetitionUnifiedRecordVo;
import com.ruoyi.system.domain.vo.CompetitionVsRecordVo;
import com.ruoyi.system.domain.vo.*;
import com.ruoyi.system.mapper.CompetitionMembersScoreMapper;
import com.ruoyi.system.mapper.CompetitionResultMapper;
import org.springframework.beans.factory.annotation.Autowired;
@@ -128,7 +125,7 @@ public class CompetitionTeamVsTeamServiceImpl implements ICompetitionTeamVsTeamS
unifiedRecordVo.setCompetitionResultList(competitionResultList);
//查询赛程中个人成绩
List<CompetitionMembersScore> membersScoreList = competitionMembersScoreMapper.findMembersScoreByCompetitionVsId(competitionTeamVsTeamVo.getCompetitionId(),competitionTeamVsTeamVo.getId());
List<CompetitionMembersScoreVo> membersScoreList = competitionMembersScoreMapper.findMembersScoreByCompetitionVsId(competitionTeamVsTeamVo.getCompetitionId(),competitionTeamVsTeamVo.getId());
List<CompetitionMembersScore> competitionMembersScoreList = new ArrayList<>();
//组装队伍球员数据并排序
@@ -173,16 +170,16 @@ public class CompetitionTeamVsTeamServiceImpl implements ICompetitionTeamVsTeamS
List<CompetitionResultVo> competitionResultList = competitionResultMapper.findByCompetitionVsId(competitionTeamVsTeamVo.getCompetitionId(),competitionTeamVsTeamVo.getId());
Optional<CompetitionResultVo> main = competitionResultList.stream().filter(a -> a.getTeamId().equals(competitionTeamVsTeamVo.getMainTeamId())).findFirst();
Optional<CompetitionResultVo> guest = competitionResultList.stream().filter(a -> a.getTeamId().equals(competitionTeamVsTeamVo.getGuestTeamId())).findFirst();
List<CompetitionMembersScore> membersScoreList = competitionMembersScoreMapper.findMembersScoreByCompetitionVsId(competitionTeamVsTeamVo.getCompetitionId(),competitionTeamVsTeamVo.getId());
List<CompetitionMembersScoreVo> membersScoreList = competitionMembersScoreMapper.findMembersScoreByCompetitionVsId(competitionTeamVsTeamVo.getCompetitionId(),competitionTeamVsTeamVo.getId());
if(main.isPresent()){
CompetitionResultVo resultVo = main.get();
List<CompetitionMembersScore> membersScores = membersScoreList.stream().filter(a -> a.getTeamId().equals(competitionTeamVsTeamVo.getMainTeamId())).collect(Collectors.toList());
List<CompetitionMembersScoreVo> membersScores = membersScoreList.stream().filter(a -> a.getTeamId().equals(competitionTeamVsTeamVo.getMainTeamId())).collect(Collectors.toList());
resultVo.setMembersScoreList(membersScores);
recordVo.setMainTeam(resultVo);
}
if(guest.isPresent()){
CompetitionResultVo resultVo = guest.get();
List<CompetitionMembersScore> membersScores = membersScoreList.stream().filter(a -> a.getTeamId().equals(competitionTeamVsTeamVo.getGuestTeamId())).collect(Collectors.toList());
List<CompetitionMembersScoreVo> membersScores = membersScoreList.stream().filter(a -> a.getTeamId().equals(competitionTeamVsTeamVo.getGuestTeamId())).collect(Collectors.toList());
resultVo.setMembersScoreList(membersScores);
recordVo.setGuestTeam(resultVo);
}

2
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/CompetitionMembersScoreMapper.xml
View File

@@ -74,7 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where id = #{id}
</select>
<select id="findMembersScoreByCompetitionVsId"
resultType="com.ruoyi.system.domain.CompetitionMembersScore">
resultType="com.ruoyi.system.domain.vo.CompetitionMembersScoreVo">
SELECT
sco.id,
vs.competition_id as competitionId,