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

Merge branch 'master' into prod

Browse Source
This commit is contained in:
wuyibo
2024-05-29 15:02:55 +08:00
parent 000d548753 ed3fe728fb
commit 84ace22cff
8 changed files with 206 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CompetitionOfTeamServiceImpl.java
View File

@@ -1,11 +1,15 @@
package com.ruoyi.system.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.api.model.LoginUser;
import com.ruoyi.system.domain.CompetitionOfTeam;
import com.ruoyi.system.domain.CompetitionTeamVsTeam;
import com.ruoyi.system.domain.vo.CompetitionOfTeamVo;
import com.ruoyi.system.mapper.CompetitionOfTeamMapper;
import com.ruoyi.system.mapper.CompetitionTeamVsTeamMapper;
import com.ruoyi.system.service.ICompetitionOfTeamService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -24,7 +28,8 @@ public class CompetitionOfTeamServiceImpl extends ServiceImpl<CompetitionOfTeamM
{
@Autowired
private CompetitionOfTeamMapper competitionOfTeamMapper;
@Autowired
private CompetitionTeamVsTeamMapper competitionTeamVsTeamMapper;
/**
* 查询赛会中-参赛队伍
*
@@ -91,6 +96,14 @@ public class CompetitionOfTeamServiceImpl extends ServiceImpl<CompetitionOfTeamM
@Override
public int deleteCompetitionOfTeamByIds(Long[] ids)
{
//赛程中排了的球队不允许删除
LambdaQueryWrapper<CompetitionTeamVsTeam> vsTeamWrapper = new QueryWrapper<CompetitionTeamVsTeam>().lambda();
vsTeamWrapper.in(CompetitionTeamVsTeam::getGuestTeamId,ids);
vsTeamWrapper.or().in(CompetitionTeamVsTeam::getMainTeamId,ids);
long count = competitionTeamVsTeamMapper.selectCount(vsTeamWrapper);
if(count>0){
throw new RuntimeException("赛程中排了的球队不允许删除");
}
return competitionOfTeamMapper.deleteCompetitionOfTeamByIds(ids);
}

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

@@ -581,7 +581,7 @@ public class CompetitionServiceImpl extends ServiceImpl<CompetitionMapper, Compe
System.out.println(JSON.toJSONString(team));
//todo 保存球队数据;
CompetitionOfTeam competitionOfTeam = competitionOfTeamMapper.selectOneByTeamName(teamName);
if (UtilTool.isNotNull(competitionOfTeam)) {
if (ObjectUtil.isNotNull(competitionOfTeam)&&ObjectUtil.isNotNull(competitionOfTeam.getId())) {
team.setId(competitionOfTeam.getId());
competitionOfTeamMapper.updateCompetitionOfTeam(team);
} else {
@@ -826,7 +826,7 @@ public class CompetitionServiceImpl extends ServiceImpl<CompetitionMapper, Compe
team.setStatus(0);
System.out.println(JSON.toJSONString(team));
//todo 保存球队数据;
if (UtilTool.isNotNull(team)) {
if (ObjectUtil.isNotNull(team)&&ObjectUtil.isNotNull(team.getId())) {
competitionOfTeamMapper.updateCompetitionOfTeam(team);
} else {
competitionOfTeamMapper.insertCompetitionOfTeam(team);