|
|
@ -95,21 +95,30 @@ public class AnnualCompGroupController extends JeecgController<AnnualCompGroup, |
|
|
|
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); |
|
|
|
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); |
|
|
|
Comp comp = new Comp(); |
|
|
|
Comp comp = new Comp(); |
|
|
|
QueryWrapper<Comp> queryWrappercomp = QueryGenerator.initQueryWrapper(comp, req.getParameterMap()); |
|
|
|
QueryWrapper<Comp> queryWrappercomp = QueryGenerator.initQueryWrapper(comp, req.getParameterMap()); |
|
|
|
queryWrappercomp.like("comp_admin",user.getUsername()); |
|
|
|
queryWrappercomp.eq("comp_admin",user.getUsername()); |
|
|
|
List<Comp> list = compService.list(queryWrappercomp); |
|
|
|
List<Comp> list = compService.list(queryWrappercomp); |
|
|
|
|
|
|
|
if(list.size()==0){ |
|
|
|
|
|
|
|
return Result.error("未绑定比赛"); |
|
|
|
|
|
|
|
} |
|
|
|
List<String> ids = list.stream().map(Comp::getId).collect(Collectors.toList()); |
|
|
|
List<String> ids = list.stream().map(Comp::getId).collect(Collectors.toList()); |
|
|
|
QueryWrapper<AnnualComp> queryWrapperAnnual = new QueryWrapper<>(); |
|
|
|
QueryWrapper<AnnualComp> queryWrapperAnnual = new QueryWrapper<>(); |
|
|
|
queryWrapperAnnual.in(ids.size()!=0,"compid",ids); |
|
|
|
queryWrapperAnnual.in("compid",ids); |
|
|
|
List<AnnualComp> listAnnual = annualCompService.list(queryWrapperAnnual); |
|
|
|
List<AnnualComp> listAnnual = annualCompService.list(queryWrapperAnnual); |
|
|
|
|
|
|
|
if(listAnnual.size()==0){ |
|
|
|
|
|
|
|
return Result.error("未创建年度比赛"); |
|
|
|
|
|
|
|
} |
|
|
|
List<String> annualIds = listAnnual.stream().map(AnnualComp::getId).collect(Collectors.toList()); |
|
|
|
List<String> annualIds = listAnnual.stream().map(AnnualComp::getId).collect(Collectors.toList()); |
|
|
|
QueryWrapper<AnnualCompGroup> queryWrapper = QueryGenerator.initQueryWrapper(annualCompGroup, req.getParameterMap()); |
|
|
|
QueryWrapper<AnnualCompGroup> queryWrapper = QueryGenerator.initQueryWrapper(annualCompGroup, req.getParameterMap()); |
|
|
|
queryWrapper.in(annualIds.size()!=0,"annal_comp",annualIds); |
|
|
|
queryWrapper.in(annualIds.size()!=0,"annal_comp",annualIds); |
|
|
|
|
|
|
|
|
|
|
|
AnnualCompPoint annualCompPoint = new AnnualCompPoint(); |
|
|
|
AnnualCompPoint annualCompPoint = new AnnualCompPoint(); |
|
|
|
QueryWrapper<AnnualCompPoint> queryWrapperacp = QueryGenerator.initQueryWrapper(annualCompPoint, req.getParameterMap()); |
|
|
|
QueryWrapper<AnnualCompPoint> queryWrapperacp = QueryGenerator.initQueryWrapper(annualCompPoint, req.getParameterMap()); |
|
|
|
queryWrapperacp.in(annualIds.size()!=0,"annual_comp_id",annualIds); |
|
|
|
queryWrapperacp.in("annual_comp_id",annualIds); |
|
|
|
queryWrapperacp.eq("annual_comp_switch","Y"); // 比赛必须是开启的
|
|
|
|
queryWrapperacp.eq("annual_comp_switch","Y"); // 比赛必须是开启的
|
|
|
|
List<AnnualCompPoint> listacp = annualCompPointService.list(queryWrapperacp); |
|
|
|
List<AnnualCompPoint> listacp = annualCompPointService.list(queryWrapperacp); |
|
|
|
|
|
|
|
if(listacp.size()==0){ |
|
|
|
|
|
|
|
return Result.error("未创建年度比赛项目"); |
|
|
|
|
|
|
|
} |
|
|
|
List<String> acpIds = listacp.stream().map(AnnualCompPoint::getId).collect(Collectors.toList()); |
|
|
|
List<String> acpIds = listacp.stream().map(AnnualCompPoint::getId).collect(Collectors.toList()); |
|
|
|
queryWrapper.in(acpIds.size()!=0,"ann_comp_p",acpIds); |
|
|
|
queryWrapper.in(acpIds.size()!=0,"ann_comp_p",acpIds); |
|
|
|
|
|
|
|
|
|
|
@ -190,7 +199,7 @@ public class AnnualCompGroupController extends JeecgController<AnnualCompGroup, |
|
|
|
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); |
|
|
|
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); |
|
|
|
Comp comp = new Comp(); |
|
|
|
Comp comp = new Comp(); |
|
|
|
QueryWrapper<Comp> queryWrapper = QueryGenerator.initQueryWrapper(comp, req.getParameterMap()); |
|
|
|
QueryWrapper<Comp> queryWrapper = QueryGenerator.initQueryWrapper(comp, req.getParameterMap()); |
|
|
|
queryWrapper.like("comp_admin",user.getUsername()); |
|
|
|
queryWrapper.eq("comp_admin",user.getUsername()); |
|
|
|
List<Comp> list = compService.list(queryWrapper); |
|
|
|
List<Comp> list = compService.list(queryWrapper); |
|
|
|
String str = ""; |
|
|
|
String str = ""; |
|
|
|
for(int i = 0 ; i < list.size() ; i++){ |
|
|
|
for(int i = 0 ; i < list.size() ; i++){ |
|
|
|