diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompetitionprojectregistration/controller/AnnualCompetitionProjectRegistrationController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompetitionprojectregistration/controller/AnnualCompetitionProjectRegistrationController.java index 60ec76e2..dcd939bc 100644 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompetitionprojectregistration/controller/AnnualCompetitionProjectRegistrationController.java +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompetitionprojectregistration/controller/AnnualCompetitionProjectRegistrationController.java @@ -1690,6 +1690,14 @@ public class AnnualCompetitionProjectRegistrationController { mapall1.put("jxname",listAll.get(y).getAwardname()); mapall1.put("ndbs",annualCompService.getById(listAll.get(y).getAnnalComp()).getName()); mapall1.put("ndbsxm",annualCompPointService.getById(listAll.get(y).getAnnualCompP()).getObjName()); + QueryWrapper queryWrapperlist = new QueryWrapper<>(); + queryWrapperlist.eq("enroll_code",listAll.get(y).getEnrollCode()); + List listdw = annualCompetitionProjectRegistrationService.list(queryWrapperlist); + if(listdw.size()>0){ + mapall1.put("dwname",listdw.get(0).getTeamName()); + }else { + mapall1.put("dwname","暂无数据"); + } QueryWrapper queryWrapperpcs = new QueryWrapper<>(); queryWrapperpcs.eq("annual_comp_id",listAll.get(y).getAnnalComp()); queryWrapperpcs.eq("annual_comp_p",listAll.get(y).getAnnualCompP()); @@ -1709,7 +1717,6 @@ public class AnnualCompetitionProjectRegistrationController { mapall2.put("jxname",listAll.get(n).getAwardname()); mapall2.put("ndbs",annualCompService.getById(listAll.get(n).getAnnalComp()).getName()); mapall2.put("ndbsxm",annualCompPointService.getById(listAll.get(n).getAnnualCompP()).getObjName()); - QueryWrapper queryWrapperlist = new QueryWrapper<>(); queryWrapperlist.eq("enroll_code",listAll.get(n).getEnrollCode()); List listdw = annualCompetitionProjectRegistrationService.list(queryWrapperlist);