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

pc端接口修改

Browse Source
This commit is contained in:
wuyibo
2023-07-20 14:57:23 +08:00
parent 8b4345df6b
commit ca6512e483
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionResultServiceImpl.java
View File

@@ -129,7 +129,7 @@ public class CompetitionResultServiceImpl implements ICompetitionResultService
CompetitionResultVo team = obj.getMainTeam(); CompetitionResultVo team = obj.getMainTeam();
team.setCompetitionId(obj.getTeamVsTeamVo().getCompetitionId()); team.setCompetitionId(obj.getTeamVsTeamVo().getCompetitionId());
team.setCompetitionVsId(obj.getTeamVsTeamVo().getId()); team.setCompetitionVsId(obj.getTeamVsTeamVo().getId());
team.setTeamId(obj.getTeamVsTeamVo().getMainTeamId()); team.setCompetitionOfTeamId(obj.getTeamVsTeamVo().getMainTeamId());
team.setTeamName(obj.getTeamVsTeamVo().getMainTeamName()); team.setTeamName(obj.getTeamVsTeamVo().getMainTeamName());
competitionResultMapper.insertCompetitionResult(team); competitionResultMapper.insertCompetitionResult(team);
}else { }else {
@@ -139,7 +139,7 @@ public class CompetitionResultServiceImpl implements ICompetitionResultService
CompetitionResultVo team = obj.getGuestTeam(); CompetitionResultVo team = obj.getGuestTeam();
team.setCompetitionId(obj.getTeamVsTeamVo().getCompetitionId()); team.setCompetitionId(obj.getTeamVsTeamVo().getCompetitionId());
team.setCompetitionVsId(obj.getTeamVsTeamVo().getId()); team.setCompetitionVsId(obj.getTeamVsTeamVo().getId());
team.setTeamId(obj.getTeamVsTeamVo().getGuestTeamId()); team.setCompetitionOfTeamId(obj.getTeamVsTeamVo().getGuestTeamId());
team.setTeamName(obj.getTeamVsTeamVo().getGuestTeamName()); team.setTeamName(obj.getTeamVsTeamVo().getGuestTeamName());
competitionResultMapper.insertCompetitionResult(team); competitionResultMapper.insertCompetitionResult(team);
}else { }else {

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

@@ -174,18 +174,18 @@ public class CompetitionTeamVsTeamServiceImpl implements ICompetitionTeamVsTeamS
} }
//获取主队每节数据 //获取主队每节数据
List<CompetitionResultVo> competitionResultList = competitionResultService.findByCompetitionVsId(competitionTeamVsTeamVo.getCompetitionId(),competitionTeamVsTeamVo.getId()); List<CompetitionResultVo> competitionResultList = competitionResultService.findByCompetitionVsId(competitionTeamVsTeamVo.getCompetitionId(),competitionTeamVsTeamVo.getId());
Optional<CompetitionResultVo> main = competitionResultList.stream().filter(a -> a.getTeamId().equals(competitionTeamVsTeamVo.getMainTeamId())).findFirst(); Optional<CompetitionResultVo> main = competitionResultList.stream().filter(a -> a.getCompetitionOfTeamId().equals(competitionTeamVsTeamVo.getMainTeamId())).findFirst();
Optional<CompetitionResultVo> guest = competitionResultList.stream().filter(a -> a.getTeamId().equals(competitionTeamVsTeamVo.getGuestTeamId())).findFirst(); Optional<CompetitionResultVo> guest = competitionResultList.stream().filter(a -> a.getCompetitionOfTeamId().equals(competitionTeamVsTeamVo.getGuestTeamId())).findFirst();
List<CompetitionMembersScoreVo> membersScoreList = competitionMembersScoreMapper.findMembersScoreByCompetitionVsId(competitionTeamVsTeamVo.getCompetitionId(),competitionTeamVsTeamVo.getId()); List<CompetitionMembersScoreVo> membersScoreList = competitionMembersScoreMapper.findMembersScoreByCompetitionVsId(competitionTeamVsTeamVo.getCompetitionId(),competitionTeamVsTeamVo.getId());
if(main.isPresent()){ if(main.isPresent()){
CompetitionResultVo resultVo = main.get(); CompetitionResultVo resultVo = main.get();
List<CompetitionMembersScoreVo> membersScores = membersScoreList.stream().filter(a -> a.getTeamId().equals(competitionTeamVsTeamVo.getMainTeamId())).collect(Collectors.toList()); List<CompetitionMembersScoreVo> membersScores = membersScoreList.stream().filter(a -> a.getCompetitionOfTeamId().equals(competitionTeamVsTeamVo.getMainTeamId())).collect(Collectors.toList());
resultVo.setMembersScoreList(membersScores); resultVo.setMembersScoreList(membersScores);
recordVo.setMainTeam(resultVo); recordVo.setMainTeam(resultVo);
} }
if(guest.isPresent()){ if(guest.isPresent()){
CompetitionResultVo resultVo = guest.get(); CompetitionResultVo resultVo = guest.get();
List<CompetitionMembersScoreVo> membersScores = membersScoreList.stream().filter(a -> a.getTeamId().equals(competitionTeamVsTeamVo.getGuestTeamId())).collect(Collectors.toList()); List<CompetitionMembersScoreVo> membersScores = membersScoreList.stream().filter(a -> a.getCompetitionOfTeamId().equals(competitionTeamVsTeamVo.getGuestTeamId())).collect(Collectors.toList());
resultVo.setMembersScoreList(membersScores); resultVo.setMembersScoreList(membersScores);
recordVo.setGuestTeam(resultVo); recordVo.setGuestTeam(resultVo);
} }