diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcUserWarnNoticeResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcUserWarnNoticeResultDTO.java index fb6fde9599..a9a847e6d8 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcUserWarnNoticeResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcUserWarnNoticeResultDTO.java @@ -20,4 +20,8 @@ public class IcUserWarnNoticeResultDTO implements Serializable { private String noticeContent; // @JsonIgnore private String buildingId; + /** + * desc:该号楼有多少个符合条件的人 + */ + private Integer count; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StatsResiWarnServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StatsResiWarnServiceImpl.java index e7507aeefb..26da3f073d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StatsResiWarnServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StatsResiWarnServiceImpl.java @@ -361,10 +361,14 @@ public class StatsResiWarnServiceImpl implements StatsResiWarnService { } //2、符合条件的楼栋 Map configMap = warnResult.getData().stream().collect(Collectors.toMap(IcResiCategoryWarnConfigDTO::getId, IcResiCategoryWarnConfigDTO::getLabel)); - List configIds = warnResult.getData().stream().map(m -> m.getId()).collect(Collectors.toList()); + List configIds = warnResult.getData().stream().map(IcResiCategoryWarnConfigDTO::getId).collect(Collectors.toList()); List list = icStatsResiWarnDao.queryUserWarnNotice(formDTO.getCustomerId(), formDTO.getAgencyId(), configIds); List resList = new ArrayList<>(); + Map level1ThresholdMap = warnResult.getData().stream().collect(Collectors.toMap(IcResiCategoryWarnConfigDTO::getId, IcResiCategoryWarnConfigDTO::getLevel1)); for (IcUserWarnNoticeResultDTO dto : list) { + if (dto.getCount() SELECT ir.BUILDING_ID, - ir.CONFIG_ID + ir.CONFIG_ID, + ir.COUNT FROM ic_stats_resi_warn ir WHERE @@ -200,4 +201,4 @@ ) - \ No newline at end of file +