|
|
@ -990,18 +990,33 @@ public class AnnualCompetitionProjectRegistrationController { |
|
|
|
map.put("bsxmSum",listacp.size()); |
|
|
|
map.put("bsxmSum",listacp.size()); |
|
|
|
//前五条项目名称数据以及对应的报名数
|
|
|
|
//前五条项目名称数据以及对应的报名数
|
|
|
|
List<Map<String,Object>> xmListMap = new ArrayList<>(); |
|
|
|
List<Map<String,Object>> xmListMap = new ArrayList<>(); |
|
|
|
for (int i = 0 ; i <5;i++){ |
|
|
|
if(listacp.size()>5){ |
|
|
|
AnnualCompetitionProjectRegistration annualCompetitionProjectRegistration = new AnnualCompetitionProjectRegistration(); |
|
|
|
for (int i = 0 ; i <5;i++){ |
|
|
|
QueryWrapper<AnnualCompetitionProjectRegistration> queryWrapperbm = QueryGenerator.initQueryWrapper(annualCompetitionProjectRegistration, req.getParameterMap()); |
|
|
|
AnnualCompetitionProjectRegistration annualCompetitionProjectRegistration = new AnnualCompetitionProjectRegistration(); |
|
|
|
queryWrapperbm.eq("annual_compid",listacp.get(i).getId()); |
|
|
|
QueryWrapper<AnnualCompetitionProjectRegistration> queryWrapperbm = QueryGenerator.initQueryWrapper(annualCompetitionProjectRegistration, req.getParameterMap()); |
|
|
|
queryWrapperbm.eq("enroll_static", "2"); |
|
|
|
queryWrapperbm.eq("annual_compid",listacp.get(i).getId()); |
|
|
|
List<AnnualCompetitionProjectRegistration> listbm = annualCompetitionProjectRegistrationService.list(queryWrapperbm); |
|
|
|
queryWrapperbm.eq("enroll_static", "2"); |
|
|
|
Map<String, Object> map1 = new HashMap<>(); |
|
|
|
List<AnnualCompetitionProjectRegistration> listbm = annualCompetitionProjectRegistrationService.list(queryWrapperbm); |
|
|
|
map1.put("xmname",listacp.get(i).getObjName()); |
|
|
|
Map<String, Object> map1 = new HashMap<>(); |
|
|
|
map1.put("xmbmrs",listbm.size()); |
|
|
|
map1.put("xmname",listacp.get(i).getObjName()); |
|
|
|
xmListMap.add(map1); |
|
|
|
map1.put("xmbmrs",listbm.size()); |
|
|
|
|
|
|
|
xmListMap.add(map1); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
}else{ |
|
|
|
|
|
|
|
for (int m = 0 ; m <listacp.size();m++){ |
|
|
|
|
|
|
|
AnnualCompetitionProjectRegistration annualCompetitionProjectRegistration = new AnnualCompetitionProjectRegistration(); |
|
|
|
|
|
|
|
QueryWrapper<AnnualCompetitionProjectRegistration> queryWrapperbm = QueryGenerator.initQueryWrapper(annualCompetitionProjectRegistration, req.getParameterMap()); |
|
|
|
|
|
|
|
queryWrapperbm.eq("annual_compid",listacp.get(m).getId()); |
|
|
|
|
|
|
|
queryWrapperbm.eq("enroll_static", "2"); |
|
|
|
|
|
|
|
List<AnnualCompetitionProjectRegistration> listbm = annualCompetitionProjectRegistrationService.list(queryWrapperbm); |
|
|
|
|
|
|
|
Map<String, Object> map1 = new HashMap<>(); |
|
|
|
|
|
|
|
map1.put("xmname",listacp.get(m).getObjName()); |
|
|
|
|
|
|
|
map1.put("xmbmrs",listbm.size()); |
|
|
|
|
|
|
|
xmListMap.add(map1); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
map.put("qwtxmList",xmListMap); |
|
|
|
map.put("qwtxmList",xmListMap); |
|
|
|
//参加比赛队伍数(报名数)
|
|
|
|
//参加比赛队伍数(报名数)
|
|
|
|
List<String> acpIds = listacp.stream().map(AnnualCompPoint::getId).collect(Collectors.toList()); |
|
|
|
List<String> acpIds = listacp.stream().map(AnnualCompPoint::getId).collect(Collectors.toList()); |
|
|
|