From 0fccdaaf2c038c4d1b2649aa320aca2f17aa076f Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期五, 20 九月 2024 09:39:57 +0800
Subject: [PATCH] 花城 修改街道大屏时间筛选

---
 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/StreetBigScreenServiceImpl.java |  187 +++++++++++++++++++++++-----------------------
 1 files changed, 95 insertions(+), 92 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/StreetBigScreenServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/StreetBigScreenServiceImpl.java
index 9c624b5..f639b93 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/StreetBigScreenServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/StreetBigScreenServiceImpl.java
@@ -14,6 +14,7 @@
 import java.time.temporal.TemporalAdjusters;
 import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -63,24 +64,25 @@
         if(StringUtils.equals(type,"1"))
         {
             //按年份
-            int year=Calendar.getInstance().get(Calendar.YEAR);
+//            int year=Calendar.getInstance().get(Calendar.YEAR);
             //获取小程序用户数量
-            userNum= baseMapper.getUserNum(streetId,communityId,year+"-01-01 00:00:00",year+"-12-31 23:59:59");
+            userNum= baseMapper.getUserNum(streetId,communityId,starTime+"-01-01 00:00:00",starTime+"-12-31 23:59:59");
             //获取实有人口总数
-            ActualPopNum= baseMapper.getActualPopNum(streetId,communityId,year+"-01-01 00:00:00",year+"-12-31 23:59:59");
+            ActualPopNum= baseMapper.getActualPopNum(streetId,communityId,starTime+"-01-01 00:00:00",starTime+"-12-31 23:59:59");
             //获取小区总数
-            VillageNum= baseMapper.getVillageNum(streetId,communityId,year+"-01-01 00:00:00",year+"-12-31 23:59:59");
+            VillageNum= baseMapper.getVillageNum(streetId,communityId,starTime+"-01-01 00:00:00",starTime+"-12-31 23:59:59");
             //获取志愿者总数
-            VolunteerNum= baseMapper.getVolunteerNum(streetId,communityId,year+"-01-01 00:00:00",year+"-12-31 23:59:59");
+            VolunteerNum= baseMapper.getVolunteerNum(streetId,communityId,starTime+"-01-01 00:00:00",starTime+"-12-31 23:59:59");
         }
         else if(StringUtils.equals(type,"2"))
         {
             //按月份
             DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+            LocalDate localDate = LocalDate.parse(starTime);
             // 获取当前月份的第一天
-            String firstDayOfMonth = LocalDate.now().with(TemporalAdjusters.firstDayOfMonth()).format(formatter);
+            String firstDayOfMonth = localDate.with(TemporalAdjusters.firstDayOfMonth()).format(formatter);
             // 获取当前月份的最后一天
-            String lastDayOfMonth = LocalDate.now().with(TemporalAdjusters.lastDayOfMonth()).format(formatter);
+            String lastDayOfMonth = localDate.with(TemporalAdjusters.lastDayOfMonth()).format(formatter);
 
             //获取小程序用户数量
             userNum= baseMapper.getUserNum(streetId,communityId,firstDayOfMonth+" 00:00:00",lastDayOfMonth+" 23:59:59");
@@ -94,15 +96,15 @@
         else if(StringUtils.equals(type,"3"))
         {
             //按天份
-            DateTimeFormatter newformatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-            String data=LocalDate.now().format(newformatter);
-            userNum= baseMapper.getUserNum(streetId,communityId,data+" 00:00:00",data+" 23:59:59");
+//            DateTimeFormatter newformatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+//            String data=LocalDate.now().format(newformatter);
+            userNum= baseMapper.getUserNum(streetId,communityId,starTime+" 00:00:00",starTime+" 23:59:59");
             //获取实有人口总数
-            ActualPopNum= baseMapper.getActualPopNum(streetId,communityId,data+" 00:00:00",data+" 23:59:59");
+            ActualPopNum= baseMapper.getActualPopNum(streetId,communityId,starTime+" 00:00:00",starTime+" 23:59:59");
             //获取小区总数
-            VillageNum= baseMapper.getVillageNum(streetId,communityId,data+" 00:00:00",data+" 23:59:59");
+            VillageNum= baseMapper.getVillageNum(streetId,communityId,starTime+" 00:00:00",starTime+" 23:59:59");
             //获取志愿者总数
-            VolunteerNum= baseMapper.getVolunteerNum(streetId,communityId,data+" 00:00:00",data+" 23:59:59");
+            VolunteerNum= baseMapper.getVolunteerNum(streetId,communityId,starTime+" 00:00:00",starTime+" 23:59:59");
         }
         else if(StringUtils.equals(type,"4"))
         {
@@ -165,23 +167,24 @@
         if(StringUtils.equals(type,"1"))
         {
             //按年份
-            int year=Calendar.getInstance().get(Calendar.YEAR);
-            partyAffairsNum=baseMapper.getThreeNum(streetId,communityId,"党务公开",year+"-01-01 00:00:00",year+"-12-31 23:59:59");
-            serviceNum=baseMapper.getThreeNum(streetId,communityId,"服务公开",year+"-01-01 00:00:00",year+"-12-31 23:59:59");
-            financeNum=baseMapper.getThreeNum(streetId,communityId,"财务公开",year+"-01-01 00:00:00",year+"-12-31 23:59:59");
-            fundNum=baseMapper.getThreeNum(streetId,communityId,"资金公开",year+"-01-01 00:00:00",year+"-12-31 23:59:59");
-            propertyNum=baseMapper.getThreeNum(streetId,communityId,"资产公开",year+"-01-01 00:00:00",year+"-12-31 23:59:59");
-            naturalResourcesNum=baseMapper.getThreeNum(streetId,communityId,"资源公开",year+"-01-01 00:00:00",year+"-12-31 23:59:59");
-            villageEconomyNum=baseMapper.getThreeNum(streetId,communityId,"村集体经济组织项目",year+"-01-01 00:00:00",year+"-12-31 23:59:59");
+//            int year=Calendar.getInstance().get(Calendar.YEAR);
+            partyAffairsNum=baseMapper.getThreeNum(streetId,communityId,"党务公开",starTime+"-01-01 00:00:00",starTime+"-12-31 23:59:59");
+            serviceNum=baseMapper.getThreeNum(streetId,communityId,"服务公开",starTime+"-01-01 00:00:00",starTime+"-12-31 23:59:59");
+            financeNum=baseMapper.getThreeNum(streetId,communityId,"财务公开",starTime+"-01-01 00:00:00",starTime+"-12-31 23:59:59");
+            fundNum=baseMapper.getThreeNum(streetId,communityId,"资金公开",starTime+"-01-01 00:00:00",starTime+"-12-31 23:59:59");
+            propertyNum=baseMapper.getThreeNum(streetId,communityId,"资产公开",starTime+"-01-01 00:00:00",starTime+"-12-31 23:59:59");
+            naturalResourcesNum=baseMapper.getThreeNum(streetId,communityId,"资源公开",starTime+"-01-01 00:00:00",starTime+"-12-31 23:59:59");
+            villageEconomyNum=baseMapper.getThreeNum(streetId,communityId,"村集体经济组织项目",starTime+"-01-01 00:00:00",starTime+"-12-31 23:59:59");
         }
         else if(StringUtils.equals(type,"2"))
         {
             //按月份
             DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+            LocalDate localDate = LocalDate.parse(starTime);
             // 获取当前月份的第一天
-            String firstDayOfMonth = LocalDate.now().with(TemporalAdjusters.firstDayOfMonth()).format(formatter);
+            String firstDayOfMonth = localDate.with(TemporalAdjusters.firstDayOfMonth()).format(formatter);
             // 获取当前月份的最后一天
-            String lastDayOfMonth = LocalDate.now().with(TemporalAdjusters.lastDayOfMonth()).format(formatter);
+            String lastDayOfMonth = localDate.with(TemporalAdjusters.lastDayOfMonth()).format(formatter);
 
             partyAffairsNum=baseMapper.getThreeNum(streetId,communityId,"党务公开",firstDayOfMonth+" 00:00:00",lastDayOfMonth+" 23:59:59");
             serviceNum=baseMapper.getThreeNum(streetId,communityId,"服务公开",firstDayOfMonth+" 00:00:00",lastDayOfMonth+" 23:59:59");
@@ -194,16 +197,16 @@
         else if(StringUtils.equals(type,"3"))
         {
             //按天份
-            DateTimeFormatter newformatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-            String data=LocalDate.now().format(newformatter);
+//            DateTimeFormatter newformatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+//            String data=LocalDate.now().format(newformatter);
 
-            partyAffairsNum=baseMapper.getThreeNum(streetId,communityId,"党务公开",data+" 00:00:00",data+" 23:59:59");
-            serviceNum=baseMapper.getThreeNum(streetId,communityId,"服务公开",data+" 00:00:00",data+" 23:59:59");
-            financeNum=baseMapper.getThreeNum(streetId,communityId,"财务公开",data+" 00:00:00",data+" 23:59:59");
-            fundNum=baseMapper.getThreeNum(streetId,communityId,"资金公开",data+" 00:00:00",data+" 23:59:59");
-            propertyNum=baseMapper.getThreeNum(streetId,communityId,"资产公开",data+" 00:00:00",data+" 23:59:59");
-            naturalResourcesNum=baseMapper.getThreeNum(streetId,communityId,"资源公开",data+" 00:00:00",data+" 23:59:59");
-            villageEconomyNum=baseMapper.getThreeNum(streetId,communityId,"村集体经济组织项目",data+" 00:00:00",data+" 23:59:59");
+            partyAffairsNum=baseMapper.getThreeNum(streetId,communityId,"党务公开",starTime+" 00:00:00",starTime+" 23:59:59");
+            serviceNum=baseMapper.getThreeNum(streetId,communityId,"服务公开",starTime+" 00:00:00",starTime+" 23:59:59");
+            financeNum=baseMapper.getThreeNum(streetId,communityId,"财务公开",starTime+" 00:00:00",starTime+" 23:59:59");
+            fundNum=baseMapper.getThreeNum(streetId,communityId,"资金公开",starTime+" 00:00:00",starTime+" 23:59:59");
+            propertyNum=baseMapper.getThreeNum(streetId,communityId,"资产公开",starTime+" 00:00:00",starTime+" 23:59:59");
+            naturalResourcesNum=baseMapper.getThreeNum(streetId,communityId,"资源公开",starTime+" 00:00:00",starTime+" 23:59:59");
+            villageEconomyNum=baseMapper.getThreeNum(streetId,communityId,"村集体经济组织项目",starTime+" 00:00:00",starTime+" 23:59:59");
         }
         else if(StringUtils.equals(type,"4"))
         {
@@ -282,32 +285,33 @@
         if(StringUtils.equals(type,"1"))
         {
             //按年份
-            int year=Calendar.getInstance().get(Calendar.YEAR);
+//            int year=Calendar.getInstance().get(Calendar.YEAR);
             //旧的报道需求问题统计数  2.问题清单 3.需求清单
-            OleProblemNum=baseMapper.getOleNeedProblemNum("2",streetId,communityId,year+"-01-01 00:00:00",year+"-12-31 23:59:59");
-            OleNeedNum=baseMapper.getOleNeedProblemNum("3",streetId,communityId,year+"-01-01 00:00:00",year+"-12-31 23:59:59");
+            OleProblemNum=baseMapper.getOleNeedProblemNum("2",streetId,communityId,starTime+"-01-01 00:00:00",starTime+"-12-31 23:59:59");
+            OleNeedNum=baseMapper.getOleNeedProblemNum("3",streetId,communityId,starTime+"-01-01 00:00:00",starTime+"-12-31 23:59:59");
             //旧的报道需求问题统计数 1问题清单  2需求清单
-            NewProblemNum=baseMapper.getNewNeedProblemNum("1",streetId,communityId,year+"-01-01 00:00:00",year+"-12-31 23:59:59");
-            NewNeedNum=baseMapper.getNewNeedProblemNum("2",streetId,communityId,year+"-01-01 00:00:00",year+"-12-31 23:59:59");
+            NewProblemNum=baseMapper.getNewNeedProblemNum("1",streetId,communityId,starTime+"-01-01 00:00:00",starTime+"-12-31 23:59:59");
+            NewNeedNum=baseMapper.getNewNeedProblemNum("2",streetId,communityId,starTime+"-01-01 00:00:00",starTime+"-12-31 23:59:59");
             //获取旧双报道服务时间
-            OldTime=baseMapper.getOldTime(streetId,communityId,year+"-01-01 00:00:00",year+"-12-31 23:59:59");
+            OldTime=baseMapper.getOldTime(streetId,communityId,starTime+"-01-01 00:00:00",starTime+"-12-31 23:59:59");
             //获取新双报道服务时间
-            NewTime=baseMapper.getNewTime(streetId,communityId,year+"-01-01 00:00:00",year+"-12-31 23:59:59");
+            NewTime=baseMapper.getNewTime(streetId,communityId,starTime+"-01-01 00:00:00",starTime+"-12-31 23:59:59");
             //党建动态数据
-            PartyBuildingNum=baseMapper.getPartyBuildingNum(streetId,communityId,year+"-01-01 00:00:00",year+"-12-31 23:59:59");
+            PartyBuildingNum=baseMapper.getPartyBuildingNum(streetId,communityId,starTime+"-01-01 00:00:00",starTime+"-12-31 23:59:59");
             //报到单位总计数据
-            UnitNum=baseMapper.getUnitNum(streetId,communityId,year+"-01-01 00:00:00",year+"-12-31 23:59:59");
+            UnitNum=baseMapper.getUnitNum(streetId,communityId,starTime+"-01-01 00:00:00",starTime+"-12-31 23:59:59");
             //报到党员总计数据
-            MemberNum=baseMapper.getMemberNum(streetId,communityId,year+"-01-01 00:00:00",year+"-12-31 23:59:59");
+            MemberNum=baseMapper.getMemberNum(streetId,communityId,starTime+"-01-01 00:00:00",starTime+"-12-31 23:59:59");
         }
         else if(StringUtils.equals(type,"2"))
         {
             //按月份
             DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+            LocalDate localDate = LocalDate.parse(starTime);
             // 获取当前月份的第一天
-            String firstDayOfMonth = LocalDate.now().with(TemporalAdjusters.firstDayOfMonth()).format(formatter);
+            String firstDayOfMonth = localDate.with(TemporalAdjusters.firstDayOfMonth()).format(formatter);
             // 获取当前月份的最后一天
-            String lastDayOfMonth = LocalDate.now().with(TemporalAdjusters.lastDayOfMonth()).format(formatter);
+            String lastDayOfMonth = localDate.with(TemporalAdjusters.lastDayOfMonth()).format(formatter);
 
             //旧的报道需求问题统计数  2.问题清单 3.需求清单
             OleProblemNum=baseMapper.getOleNeedProblemNum("2",streetId,communityId,firstDayOfMonth+" 00:00:00",lastDayOfMonth+" 23:59:59");
@@ -329,25 +333,25 @@
         else if(StringUtils.equals(type,"3"))
         {
             //按天份
-            DateTimeFormatter newformatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-            String data=LocalDate.now().format(newformatter);
+//            DateTimeFormatter newformatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+//            String data=LocalDate.now().format(newformatter);
 
             //旧的报道需求问题统计数  2.问题清单 3.需求清单
-            OleProblemNum=baseMapper.getOleNeedProblemNum("2",streetId,communityId,data+" 00:00:00",data+" 23:59:59");
-            OleNeedNum=baseMapper.getOleNeedProblemNum("3",streetId,communityId,data+" 00:00:00",data+" 23:59:59");
+            OleProblemNum=baseMapper.getOleNeedProblemNum("2",streetId,communityId,starTime+" 00:00:00",starTime+" 23:59:59");
+            OleNeedNum=baseMapper.getOleNeedProblemNum("3",streetId,communityId,starTime+" 00:00:00",starTime+" 23:59:59");
             //旧的报道需求问题统计数 1问题清单  2需求清单
-            NewProblemNum=baseMapper.getNewNeedProblemNum("1",streetId,communityId,data+" 00:00:00",data+" 23:59:59");
-            NewNeedNum=baseMapper.getNewNeedProblemNum("2",streetId,communityId,data+" 00:00:00",data+" 23:59:59");
+            NewProblemNum=baseMapper.getNewNeedProblemNum("1",streetId,communityId,starTime+" 00:00:00",starTime+" 23:59:59");
+            NewNeedNum=baseMapper.getNewNeedProblemNum("2",streetId,communityId,starTime+" 00:00:00",starTime+" 23:59:59");
             //获取旧双报道服务时间
-            OldTime=baseMapper.getOldTime(streetId,communityId,data+" 00:00:00",data+" 23:59:59");
+            OldTime=baseMapper.getOldTime(streetId,communityId,starTime+" 00:00:00",starTime+" 23:59:59");
             //获取新双报道服务时间
-            NewTime=baseMapper.getNewTime(streetId,communityId,data+" 00:00:00",data+" 23:59:59");
+            NewTime=baseMapper.getNewTime(streetId,communityId,starTime+" 00:00:00",starTime+" 23:59:59");
             //党建动态数据
-            PartyBuildingNum=baseMapper.getPartyBuildingNum(streetId,communityId,data+" 00:00:00",data+" 23:59:59");
+            PartyBuildingNum=baseMapper.getPartyBuildingNum(streetId,communityId,starTime+" 00:00:00",starTime+" 23:59:59");
             //报到单位总计数据
-            UnitNum=baseMapper.getUnitNum(streetId,communityId,data+" 00:00:00",data+" 23:59:59");
+            UnitNum=baseMapper.getUnitNum(streetId,communityId,starTime+" 00:00:00",starTime+" 23:59:59");
             //报到党员总计数据
-            MemberNum=baseMapper.getMemberNum(streetId,communityId,data+" 00:00:00",data+" 23:59:59");
+            MemberNum=baseMapper.getMemberNum(streetId,communityId,starTime+" 00:00:00",starTime+" 23:59:59");
         }
         else if(StringUtils.equals(type,"4"))
         {
@@ -448,28 +452,28 @@
         if(StringUtils.equals(type,"1"))
         {
             //按年份
-            int year=Calendar.getInstance().get(Calendar.YEAR);
+//            int year=Calendar.getInstance().get(Calendar.YEAR);
 
             //随手拍
-            photoList=baseMapper.getPhotoMicroWishData("1","%Y",streetId,communityId,year+"-01-01 00:00:00",year+"-12-31 23:59:59");
+            photoList=baseMapper.getPhotoMicroWishData("1","%Y",streetId,communityId,starTime+"-01-01 00:00:00",starTime+"-12-31 23:59:59");
             //微心愿
-            microWishList=baseMapper.getPhotoMicroWishData("2","%Y",streetId,communityId,year+"-01-01 00:00:00",year+"-12-31 23:59:59");
+            microWishList=baseMapper.getPhotoMicroWishData("2","%Y",streetId,communityId,starTime+"-01-01 00:00:00",starTime+"-12-31 23:59:59");
 
-            photoNum=baseMapper.getPhotoAllNum(streetId,communityId,year+"-01-01 00:00:00",year+"-12-31 23:59:59");
-            microWishNum=baseMapper.getMicroWishAllNum(streetId,communityId,year+"-01-01 00:00:00",year+"-12-31 23:59:59");
+            photoNum=baseMapper.getPhotoAllNum(streetId,communityId,starTime+"-01-01 00:00:00",starTime+"-12-31 23:59:59");
+            microWishNum=baseMapper.getMicroWishAllNum(streetId,communityId,starTime+"-01-01 00:00:00",starTime+"-12-31 23:59:59");
         }
         else if(StringUtils.equals(type,"2"))
         {
             //按月份
             DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+            LocalDate localDate = LocalDate.parse(starTime);
             // 获取当前月份的第一天
-            String firstDayOfMonth = LocalDate.now().with(TemporalAdjusters.firstDayOfMonth()).format(formatter);
+            String firstDayOfMonth = localDate.with(TemporalAdjusters.firstDayOfMonth()).format(formatter);
             // 获取当前月份的最后一天
-            String lastDayOfMonth = LocalDate.now().with(TemporalAdjusters.lastDayOfMonth()).format(formatter);
+            String lastDayOfMonth = localDate.with(TemporalAdjusters.lastDayOfMonth()).format(formatter);
 
             photoList=baseMapper.getPhotoMicroWishData("1","%Y-%m",streetId,communityId,firstDayOfMonth+" 00:00:00",lastDayOfMonth+" 23:59:59");
             microWishList=baseMapper.getPhotoMicroWishData("2","%Y-%m",streetId,communityId,firstDayOfMonth+" 00:00:00",lastDayOfMonth+" 23:59:59");
-
 
             photoNum=baseMapper.getPhotoAllNum(streetId,communityId,firstDayOfMonth+" 00:00:00",lastDayOfMonth+" 23:59:59");
             microWishNum=baseMapper.getMicroWishAllNum(streetId,communityId,firstDayOfMonth+" 00:00:00",lastDayOfMonth+" 23:59:59");
@@ -478,14 +482,14 @@
         else if(StringUtils.equals(type,"3"))
         {
             //按天份
-            DateTimeFormatter newformatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-            String data=LocalDate.now().format(newformatter);
+//            DateTimeFormatter newformatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+//            String data=LocalDate.now().format(newformatter);
 
-            photoList=baseMapper.getPhotoMicroWishData("1","%Y-%m-%d",streetId,communityId,data+" 00:00:00",data+" 23:59:59");
-            microWishList=baseMapper.getPhotoMicroWishData("2","%Y-%m-%d",streetId,communityId,data+" 00:00:00",data+" 23:59:59");
+            photoList=baseMapper.getPhotoMicroWishData("1","%Y-%m-%d",streetId,communityId,starTime+" 00:00:00",starTime+" 23:59:59");
+            microWishList=baseMapper.getPhotoMicroWishData("2","%Y-%m-%d",streetId,communityId,starTime+" 00:00:00",starTime+" 23:59:59");
 
-            photoNum=baseMapper.getPhotoAllNum(streetId,communityId,data+" 00:00:00",data+" 23:59:59");
-            microWishNum=baseMapper.getMicroWishAllNum(streetId,communityId,data+" 00:00:00",data+" 23:59:59");
+            photoNum=baseMapper.getPhotoAllNum(streetId,communityId,starTime+" 00:00:00",starTime+" 23:59:59");
+            microWishNum=baseMapper.getMicroWishAllNum(streetId,communityId,starTime+" 00:00:00",starTime+" 23:59:59");
         }
         else if(StringUtils.equals(type,"4"))
         {
@@ -589,29 +593,29 @@
         if(StringUtils.equals(type,"1"))
         {
             //按年份
-            int year=Calendar.getInstance().get(Calendar.YEAR);
+//            int year=Calendar.getInstance().get(Calendar.YEAR);
 
             //* 社区活动统计
-            nommunityActNumList=baseMapper.getNommunityActNumList("%Y",streetId,communityId,year+"-01-01 00:00:00",year+"-12-31 23:59:59");
+            nommunityActNumList=baseMapper.getNommunityActNumList("%Y",streetId,communityId,starTime+"-01-01 00:00:00",starTime+"-12-31 23:59:59");
             //社区动态
-            nommunityDynNumList=baseMapper.getNommunityDynNumList("%Y",streetId,communityId,year+"-01-01 00:00:00",year+"-12-31 23:59:59");
+            nommunityDynNumList=baseMapper.getNommunityDynNumList("%Y",streetId,communityId,starTime+"-01-01 00:00:00",starTime+"-12-31 23:59:59");
             //问卷调查
-            questnaireNumList=baseMapper.getQuestnaireNumList("%Y",streetId,communityId,year+"-01-01 00:00:00",year+"-12-31 23:59:59");
+            questnaireNumList=baseMapper.getQuestnaireNumList("%Y",streetId,communityId,starTime+"-01-01 00:00:00",starTime+"-12-31 23:59:59");
             //议事投票
-            discussList=baseMapper.getDiscussNumList("%Y",streetId,communityId,year+"-01-01 00:00:00",year+"-12-31 23:59:59");
+            discussList=baseMapper.getDiscussNumList("%Y",streetId,communityId,starTime+"-01-01 00:00:00",starTime+"-12-31 23:59:59");
 
 
             //议事投票数量")
-            discussNum=baseMapper.getDiscussNum(streetId,communityId,year+"-01-01 00:00:00",year+"-12-31 23:59:59");
+            discussNum=baseMapper.getDiscussNum(streetId,communityId,starTime+"-01-01 00:00:00",starTime+"-12-31 23:59:59");
 
             //问卷调查数量")
-            questnaireNum=baseMapper.getQuestnaireNum(streetId,communityId,year+"-01-01 00:00:00",year+"-12-31 23:59:59");
+            questnaireNum=baseMapper.getQuestnaireNum(streetId,communityId,starTime+"-01-01 00:00:00",starTime+"-12-31 23:59:59");
 
             //社区动态数量")
-            nommunityDynNum=baseMapper.getNommunityDynNum(streetId,communityId,year+"-01-01 00:00:00",year+"-12-31 23:59:59");
+            nommunityDynNum=baseMapper.getNommunityDynNum(streetId,communityId,starTime+"-01-01 00:00:00",starTime+"-12-31 23:59:59");
 
             //社区活动数量")
-            nommunityActNum=baseMapper.getNommunityActNum(streetId,communityId,year+"-01-01 00:00:00",year+"-12-31 23:59:59");
+            nommunityActNum=baseMapper.getNommunityActNum(streetId,communityId,starTime+"-01-01 00:00:00",starTime+"-12-31 23:59:59");
 
 
         }
@@ -619,10 +623,11 @@
         {
             //按月份
             DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+            LocalDate localDate = LocalDate.parse(starTime);
             // 获取当前月份的第一天
-            String firstDayOfMonth = LocalDate.now().with(TemporalAdjusters.firstDayOfMonth()).format(formatter);
+            String firstDayOfMonth = localDate.with(TemporalAdjusters.firstDayOfMonth()).format(formatter);
             // 获取当前月份的最后一天
-            String lastDayOfMonth = LocalDate.now().with(TemporalAdjusters.lastDayOfMonth()).format(formatter);
+            String lastDayOfMonth = localDate.with(TemporalAdjusters.lastDayOfMonth()).format(formatter);
 
             //* 社区活动统计
             nommunityActNumList=baseMapper.getNommunityActNumList("%Y-%m",streetId,communityId,firstDayOfMonth+" 00:00:00",lastDayOfMonth+" 23:59:59");
@@ -637,32 +642,30 @@
         else if(StringUtils.equals(type,"3"))
         {
             //按天份
-            DateTimeFormatter newformatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-            String data=LocalDate.now().format(newformatter);
+//            DateTimeFormatter newformatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+//            String data=LocalDate.now().format(newformatter);
 
             //* 社区活动统计
-            nommunityActNumList=baseMapper.getNommunityActNumList("%Y-%m-%d",streetId,communityId,data+" 00:00:00",data+" 23:59:59");
+            nommunityActNumList=baseMapper.getNommunityActNumList("%Y-%m-%d",streetId,communityId,starTime+" 00:00:00",starTime+" 23:59:59");
             //社区动态
-            nommunityDynNumList=baseMapper.getNommunityDynNumList("%Y-%m-%d",streetId,communityId,data+" 00:00:00",data+" 23:59:59");
+            nommunityDynNumList=baseMapper.getNommunityDynNumList("%Y-%m-%d",streetId,communityId,starTime+" 00:00:00",starTime+" 23:59:59");
             //问卷调查
-            questnaireNumList=baseMapper.getQuestnaireNumList("%Y-%m-%d",streetId,communityId,data+" 00:00:00",data+" 23:59:59");
+            questnaireNumList=baseMapper.getQuestnaireNumList("%Y-%m-%d",streetId,communityId,starTime+" 00:00:00",starTime+" 23:59:59");
             //议事投票
-            discussList=baseMapper.getDiscussNumList("%Y-%m-%d",streetId,communityId,data+" 00:00:00",data+" 23:59:59");
-
-
+            discussList=baseMapper.getDiscussNumList("%Y-%m-%d",streetId,communityId,starTime+" 00:00:00",starTime+" 23:59:59");
 
 
             //议事投票数量")
-            discussNum=baseMapper.getDiscussNum(streetId,communityId,data+" 00:00:00",data+" 23:59:59");
+            discussNum=baseMapper.getDiscussNum(streetId,communityId,starTime+" 00:00:00",starTime+" 23:59:59");
 
             //问卷调查数量")
-            questnaireNum=baseMapper.getQuestnaireNum(streetId,communityId,data+" 00:00:00",data+" 23:59:59");
+            questnaireNum=baseMapper.getQuestnaireNum(streetId,communityId,starTime+" 00:00:00",starTime+" 23:59:59");
 
             //社区动态数量")
-            nommunityDynNum=baseMapper.getNommunityDynNum(streetId,communityId,data+" 00:00:00",data+" 23:59:59");
+            nommunityDynNum=baseMapper.getNommunityDynNum(streetId,communityId,starTime+" 00:00:00",starTime+" 23:59:59");
 
             //社区活动数量")
-            nommunityActNum=baseMapper.getNommunityActNum(streetId,communityId,data+" 00:00:00",data+" 23:59:59");
+            nommunityActNum=baseMapper.getNommunityActNum(streetId,communityId,starTime+" 00:00:00",starTime+" 23:59:59");
 
 
 

--
Gitblit v1.7.1