wsy182/RuoYi-Cloud
1
1
Fork 0
mirror of https://gitee.com/y_project/RuoYi-Cloud.git synced 2026-01-30 05:21:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

导入球队的队员头像补充1

Browse Source
This commit is contained in:
wuyibo
2023-09-08 18:41:26 +08:00
parent fcc3a3e314
commit 755a6a2986
1 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,7 +5,6 @@ import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.hutool.crypto.digest.DigestUtil; import cn.hutool.crypto.digest.DigestUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.constant.CacheConstants; import com.ruoyi.common.core.constant.CacheConstants;
import com.ruoyi.common.core.constant.Constants; import com.ruoyi.common.core.constant.Constants;
@@ -794,12 +793,7 @@ public class CompetitionServiceImpl extends ServiceImpl<CompetitionMapper, Compe
if (ObjectUtil.isNotNull(user) && ObjectUtil.isNotNull(user.getUserid())) { if (ObjectUtil.isNotNull(user) && ObjectUtil.isNotNull(user.getUserid())) {
userId = String.valueOf(user.getUserid()); userId = String.valueOf(user.getUserid());
} }
QueryWrapper<CompetitionOfTeam> wrapper = new QueryWrapper<>(); CompetitionOfTeam team = competitionOfTeamMapper.selectOneByTeamName(teamName);
wrapper.lambda().eq(CompetitionOfTeam::getTeamName,teamName)
.eq(CompetitionOfTeam::getIsDeleted,0)
.eq(CompetitionOfTeam::getCompetitionId,competitionId)
.last("limit 1");
CompetitionOfTeam team = competitionOfTeamMapper.selectOne(wrapper);
if(ObjectUtil.isNull(team)){ if(ObjectUtil.isNull(team)){
team = new CompetitionOfTeam(); team = new CompetitionOfTeam();
} }
@@ -838,12 +832,11 @@ public class CompetitionServiceImpl extends ServiceImpl<CompetitionMapper, Compe
competitionOfTeamMapper.insertCompetitionOfTeam(team); competitionOfTeamMapper.insertCompetitionOfTeam(team);
} }
excleVo.setOfTeam(team); excleVo.setOfTeam(team);
//todo 清空球员数据 //查询已经存在的球员
QueryWrapper<CompetitionMembers> wrapper1 = new QueryWrapper<>(); CompetitionMembers param = new CompetitionMembers();
wrapper1.lambda().eq(CompetitionMembers::getCompetitionOfTeamId,team.getId()) param.setCompetitionOfTeamId(team.getId());
.eq(CompetitionMembers::getIsDeleted,0) param.setCompetitionId(competitionId);
.eq(CompetitionMembers::getCompetitionId,competitionId); List<CompetitionMembers> dbMembersList = competitionMembersMapper.selectCompetitionMembersList(param);
List<CompetitionMembers> dbMembersList = competitionMembersMapper.selectList(wrapper1);
//要获得属性 //要获得属性
List<CompetitionMembers> membersVos = new ArrayList<>(); List<CompetitionMembers> membersVos = new ArrayList<>();
@@ -865,11 +858,14 @@ public class CompetitionServiceImpl extends ServiceImpl<CompetitionMapper, Compe
if (StringUtils.isEmpty(membersVo.getRealName())) { if (StringUtils.isEmpty(membersVo.getRealName())) {
break; break;
} }
//通过查询到的球员数据赋值Id
Optional<CompetitionMembers> opt = dbMembersList.stream().filter(a -> a.getCompetitionId().equals(competition.getId()) Optional<CompetitionMembers> opt = dbMembersList.stream().filter(a -> a.getCompetitionId().equals(competition.getId())
&& a.getRealName().equals(membersVo.getRealName()) && a.getRealName().equals(membersVo.getRealName())
&& a.getCompetitionOfTeamId().equals(membersVo.getCompetitionOfTeamId())).findFirst(); && a.getCompetitionOfTeamId().equals(membersVo.getCompetitionOfTeamId())).findFirst();
if(opt.isPresent()){ if(opt.isPresent()){
membersVo.setId(opt.get().getId()); membersVo.setId(opt.get().getId());
}else {
continue;
} }
//球衣号码 //球衣号码
cell = row.getCell(2); cell = row.getCell(2);