From b9324c7df56b7a9767b0c0dbd7ebaef628b8aeae Mon Sep 17 00:00:00 2001 From: lidongdong <1459917685@qq.com> Date: 星期一, 05 六月 2023 18:18:45 +0800 Subject: [PATCH] 修改居家养老报错 --- springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenStatisticsServiceImpl.java | 89 +++++++------------------------------------- 1 files changed, 14 insertions(+), 75 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenStatisticsServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenStatisticsServiceImpl.java index c5c13d4..a1eb4ef 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenStatisticsServiceImpl.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenStatisticsServiceImpl.java @@ -1,64 +1,13 @@ package com.panzhihua.service_community.service.impl; -import static java.util.Objects.isNull; -import static java.util.Objects.nonNull; - -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Comparator; -import java.util.Date; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.stream.Collectors; - -import javax.annotation.Resource; - -import com.panzhihua.common.model.vos.community.bigscreen.BigScreenDpcStatisticsInfo; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Service; - import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.panzhihua.common.model.dtos.PageBaseDTO; import com.panzhihua.common.model.dtos.community.convenient.PagePopularMerchantDTO; import com.panzhihua.common.model.dtos.property.CommonPage; import com.panzhihua.common.model.vos.R; -import com.panzhihua.common.model.vos.community.ComActDynVO; -import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO; -import com.panzhihua.common.model.vos.community.ComActFourMemberVO; -import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO; -import com.panzhihua.common.model.vos.community.ComSwPatrolRecordVO; -import com.panzhihua.common.model.vos.community.StatisticsCommVO; -import com.panzhihua.common.model.vos.community.bigscreen.BigScreenActivityLine; -import com.panzhihua.common.model.vos.community.bigscreen.BigScreenAlarmStatisticsInfo; -import com.panzhihua.common.model.vos.community.bigscreen.BigScreenCommunityStatisticsVO; -import com.panzhihua.common.model.vos.community.bigscreen.BigScreenCourtyardStatisticsInfo; -import com.panzhihua.common.model.vos.community.bigscreen.BigScreenDynStatisticsInfo; -import com.panzhihua.common.model.vos.community.bigscreen.BigScreenEasyPhotoStatisticsInfo; -import com.panzhihua.common.model.vos.community.bigscreen.BigScreenFiveAssociationsStatisticsInfo; -import com.panzhihua.common.model.vos.community.bigscreen.BigScreenFmsStatisticsInfo; -import com.panzhihua.common.model.vos.community.bigscreen.BigScreenFourMemberStatisticsInfo; -import com.panzhihua.common.model.vos.community.bigscreen.BigScreenHatchStatisticsInfo; -import com.panzhihua.common.model.vos.community.bigscreen.BigScreenHmkBaseInfo; -import com.panzhihua.common.model.vos.community.bigscreen.BigScreenHmkProjectInfo; -import com.panzhihua.common.model.vos.community.bigscreen.BigScreenHmkProjectTypeInfo; -import com.panzhihua.common.model.vos.community.bigscreen.BigScreenHmkSocialOrgInfo; -import com.panzhihua.common.model.vos.community.bigscreen.BigScreenHmkSocialWorkerInfo; -import com.panzhihua.common.model.vos.community.bigscreen.BigScreenMerchantStatisticsInfo; -import com.panzhihua.common.model.vos.community.bigscreen.BigScreenMicroWishStatisticsInfo; -import com.panzhihua.common.model.vos.community.bigscreen.BigScreenNeighborStatisticsInfo; -import com.panzhihua.common.model.vos.community.bigscreen.BigScreenPartyBuildIngStatisticsInfo; -import com.panzhihua.common.model.vos.community.bigscreen.BigScreenQuestionnaireStatisticsInfo; -import com.panzhihua.common.model.vos.community.bigscreen.BigScreenResidentActStatisticsInfo; -import com.panzhihua.common.model.vos.community.bigscreen.BigScreenVolunteerActStatisticsInfo; -import com.panzhihua.common.model.vos.community.bigscreen.BigScreenVolunteerStatisticsInfo; -import com.panzhihua.common.model.vos.community.bigscreen.EquipmentPointMapDataVO; -import com.panzhihua.common.model.vos.community.bigscreen.FourMemberOrgRelationVO; -import com.panzhihua.common.model.vos.community.bigscreen.GridsGovernanceStatisticsVO; -import com.panzhihua.common.model.vos.community.bigscreen.ResidentAutonomyStatisticsVO; -import com.panzhihua.common.model.vos.community.bigscreen.VolunteerOrgRelationVO; +import com.panzhihua.common.model.vos.community.*; +import com.panzhihua.common.model.vos.community.bigscreen.*; import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO; import com.panzhihua.common.model.vos.community.fms.ComFmsTeamVO; import com.panzhihua.common.model.vos.community.screen.civil.CivilVillageStatisticsVO; @@ -68,31 +17,21 @@ import com.panzhihua.common.model.vos.property.ComPropertyAlarmVO; import com.panzhihua.common.model.vos.property.ComPropertyEquipmentVO; import com.panzhihua.common.utlis.DateUtils; -import com.panzhihua.service_community.dao.ComActActivityDAO; -import com.panzhihua.service_community.dao.ComActCommitteeDao; -import com.panzhihua.service_community.dao.ComActDAO; -import com.panzhihua.service_community.dao.ComActDiscussDAO; -import com.panzhihua.service_community.dao.ComActDynDAO; -import com.panzhihua.service_community.dao.ComActEasyPhotoDAO; -import com.panzhihua.service_community.dao.ComActEnterpriseDAO; -import com.panzhihua.service_community.dao.ComActFourMemberDao; -import com.panzhihua.service_community.dao.ComActMicroWishDAO; -import com.panzhihua.service_community.dao.ComActNeighborCircleDAO; -import com.panzhihua.service_community.dao.ComActQuestnaireDAO; -import com.panzhihua.service_community.dao.ComActSocialOrgDao; -import com.panzhihua.service_community.dao.ComActSocialOrgHatchDAO; -import com.panzhihua.service_community.dao.ComActSocialProjectDao; -import com.panzhihua.service_community.dao.ComActSocialWorkerDao; -import com.panzhihua.service_community.dao.ComActWarehouseDonatesDao; -import com.panzhihua.service_community.dao.ComFmsServiceDAO; -import com.panzhihua.service_community.dao.ComMngPopulationDAO; -import com.panzhihua.service_community.dao.ComMngVolunteerMngDAO; -import com.panzhihua.service_community.dao.ComPropertyDao; -import com.panzhihua.service_community.dao.ConvenientMerchantDAO; +import com.panzhihua.service_community.dao.*; import com.panzhihua.service_community.model.dos.ComActDO; import com.panzhihua.service_community.service.BigScreenStatisticsService; - import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.math.BigDecimal; +import java.util.*; +import java.util.stream.Collectors; + +import static java.util.Objects.isNull; +import static java.util.Objects.nonNull; /** * @title: BigScreenStatisticsServiceImpl -- Gitblit v1.7.1