diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompetitionprojectregistration/entity/AnnualCompetitionProjectRegistration.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompetitionprojectregistration/entity/AnnualCompetitionProjectRegistration.java index 6c9ec8bb..5794eba0 100644 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompetitionprojectregistration/entity/AnnualCompetitionProjectRegistration.java +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompetitionprojectregistration/entity/AnnualCompetitionProjectRegistration.java @@ -101,13 +101,6 @@ public class AnnualCompetitionProjectRegistration implements Serializable { @ApiModelProperty(value = "队伍名称") private java.lang.String teamName; - /** - * 队伍名称 - */ - @Excel(name = "部门id", width = 30) - @ApiModelProperty(value = "部门id") - private java.lang.String departId; - @Excel(name = "年度", width = 15) @ApiModelProperty(value = "年度") diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/bigScreen/service/CompSystemBigScreenServiceImpl.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/bigScreen/service/CompSystemBigScreenServiceImpl.java index 22c968be..5d9c203d 100644 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/bigScreen/service/CompSystemBigScreenServiceImpl.java +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/bigScreen/service/CompSystemBigScreenServiceImpl.java @@ -120,7 +120,7 @@ public class CompSystemBigScreenServiceImpl implements CompSystemBigScreenServic //部门名称 vo.setCompOrganName(depart.getDepartName()); List registrationList = iAnnualCompetitionProjectRegistrationService.list(new LambdaQueryWrapper() - .eq(AnnualCompetitionProjectRegistration::getDepartId, depart.getOrgCode())); + .eq(AnnualCompetitionProjectRegistration::getSysOrgCode, depart.getOrgCode())); Map> annualCompIdListMap = Optional.ofNullable(registrationList).orElse(new LinkedList<>()).stream() .collect(Collectors.groupingBy(AnnualCompetitionProjectRegistration::getAnnualCompid)); Optional.ofNullable(annualCompIdListMap).orElse(new LinkedHashMap<>()).forEach((key, obj) -> { @@ -182,7 +182,7 @@ public class CompSystemBigScreenServiceImpl implements CompSystemBigScreenServic Map resultMap = new LinkedHashMap<>(); //部门报名人数 List registrationList = iAnnualCompetitionProjectRegistrationService.list(new LambdaQueryWrapper() - .eq(AnnualCompetitionProjectRegistration::getDepartId, depart.getOrgCode())); + .eq(AnnualCompetitionProjectRegistration::getSysOrgCode, depart.getOrgCode())); //部门得奖人数 List awardPersionList = iAwardPersionService.list(new LambdaQueryWrapper() @@ -464,7 +464,7 @@ public class CompSystemBigScreenServiceImpl implements CompSystemBigScreenServic compCounts.put("count", count); Long personCount = iAnnualCompetitionProjectRegistrationService.count(new LambdaQueryWrapper() .eq(AnnualCompetitionProjectRegistration::getEntryFormat, "0") - .eq(AnnualCompetitionProjectRegistration::getDepartId, sysDepart.getOrgCode())); + .eq(AnnualCompetitionProjectRegistration::getSysOrgCode, sysDepart.getOrgCode())); //学生人数 compCounts.put("personCompCount", personCount); Long teamCount = count - personCount; @@ -771,7 +771,7 @@ public class CompSystemBigScreenServiceImpl implements CompSystemBigScreenServic //报名表 List list = iAnnualCompetitionProjectRegistrationService.list(new LambdaQueryWrapper() .in(AnnualCompetitionProjectRegistration::getAnnualCompid, annualCompPointIds) - .eq(AnnualCompetitionProjectRegistration::getDepartId, sysDepart.getOrgCode()) + .eq(AnnualCompetitionProjectRegistration::getSysOrgCode, sysDepart.getOrgCode()) ); compVo.setNumber(list.size()); }