河南机电职业学院-大屏数据统计

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 = "年度")

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<AnnualCompetitionProjectRegistration> registrationList = iAnnualCompetitionProjectRegistrationService.list(new LambdaQueryWrapper<AnnualCompetitionProjectRegistration>()
-                    .eq(AnnualCompetitionProjectRegistration::getDepartId, depart.getOrgCode()));
+                    .eq(AnnualCompetitionProjectRegistration::getSysOrgCode, depart.getOrgCode()));
             Map<String, List<AnnualCompetitionProjectRegistration>> 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<String, Object> resultMap = new LinkedHashMap<>();
             //部门报名人数
             List<AnnualCompetitionProjectRegistration> registrationList = iAnnualCompetitionProjectRegistrationService.list(new LambdaQueryWrapper<AnnualCompetitionProjectRegistration>()
-                    .eq(AnnualCompetitionProjectRegistration::getDepartId, depart.getOrgCode()));
+                    .eq(AnnualCompetitionProjectRegistration::getSysOrgCode, depart.getOrgCode()));
 
             //部门得奖人数
             List<AwardPersion> awardPersionList = iAwardPersionService.list(new LambdaQueryWrapper<AwardPersion>()
@@ -464,7 +464,7 @@ public class CompSystemBigScreenServiceImpl implements CompSystemBigScreenServic
         compCounts.put("count", count);
         Long personCount = iAnnualCompetitionProjectRegistrationService.count(new LambdaQueryWrapper<AnnualCompetitionProjectRegistration>()
                 .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<AnnualCompetitionProjectRegistration> list = iAnnualCompetitionProjectRegistrationService.list(new LambdaQueryWrapper<AnnualCompetitionProjectRegistration>()
                             .in(AnnualCompetitionProjectRegistration::getAnnualCompid, annualCompPointIds)
-                            .eq(AnnualCompetitionProjectRegistration::getDepartId, sysDepart.getOrgCode())
+                            .eq(AnnualCompetitionProjectRegistration::getSysOrgCode, sysDepart.getOrgCode())
                     );
                     compVo.setNumber(list.size());
                 }