花城-智慧社区
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
mitao
2025-05-20 179c4d64313c9b7572778da4aaaf6c6584fe457d 
 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/StreetBigScreenServiceImpl.java


@@ -7,14 +7,16 @@


import com.panzhihua.common.utlis.StringUtils;


import com.panzhihua.service_dangjian.dao.StreetBigScreenDAO;


import com.panzhihua.service_dangjian.service.StreetBigScreenService;


import io.swagger.annotations.ApiModelProperty;


import org.springframework.stereotype.Service;




import java.text.ParseException;


import java.text.SimpleDateFormat;


import java.time.LocalDate;


import java.time.format.DateTimeFormatter;


import java.time.temporal.TemporalAdjusters;


import java.util.ArrayList;


import java.util.Calendar;


import java.util.Date;


import java.util.List;




/**


@@ -64,24 +66,34 @@


        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");


            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");


            Date date = null;


            try {


                date = sdf.parse(starTime+"-01");


            } catch (ParseException e) {


                e.printStackTrace();


            }


            Calendar calendar = Calendar.getInstance();


            calendar.setTime(date);


            calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMaximum(Calendar.DAY_OF_MONTH));


            Date lastDay = calendar.getTime();


            // 获取当前月份的第一天


            String firstDayOfMonth = LocalDate.now().with(TemporalAdjusters.firstDayOfMonth()).format(formatter);


            // 获取当前月份的最后一天


            String lastDayOfMonth = LocalDate.now().with(TemporalAdjusters.lastDayOfMonth()).format(formatter);


            String firstDayOfMonth = starTime+"-01";


//                // 获取当前月份的最后一天


            String lastDayOfMonth = sdf.format(lastDay);




            //获取小程序用户数量


            userNum= baseMapper.getUserNum(streetId,communityId,firstDayOfMonth+" 00:00:00",lastDayOfMonth+" 23:59:59");


@@ -95,15 +107,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"))


        {


@@ -166,45 +178,62 @@


        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");


            // 获取当前月份的第一天


            String firstDayOfMonth = LocalDate.now().with(TemporalAdjusters.firstDayOfMonth()).format(formatter);


            // 获取当前月份的最后一天


            String lastDayOfMonth = LocalDate.now().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");


            financeNum=baseMapper.getThreeNum(streetId,communityId,"财务公开",firstDayOfMonth+" 00:00:00",lastDayOfMonth+" 23:59:59");


            fundNum=baseMapper.getThreeNum(streetId,communityId,"资金公开",firstDayOfMonth+" 00:00:00",lastDayOfMonth+" 23:59:59");


            propertyNum=baseMapper.getThreeNum(streetId,communityId,"资产公开",firstDayOfMonth+" 00:00:00",lastDayOfMonth+" 23:59:59");


            naturalResourcesNum=baseMapper.getThreeNum(streetId,communityId,"资源公开",firstDayOfMonth+" 00:00:00",lastDayOfMonth+" 23:59:59");


            villageEconomyNum=baseMapper.getThreeNum(streetId,communityId,"村集体经济组织项目",firstDayOfMonth+" 00:00:00",lastDayOfMonth+" 23:59:59");


            try {


                //按月份


                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");


                Date date = sdf.parse(starTime+"-01");


                Calendar calendar = Calendar.getInstance();


                calendar.setTime(date);


                calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMaximum(Calendar.DAY_OF_MONTH));


                Date lastDay = calendar.getTime();


                // 获取当前月份的第一天


                String firstDayOfMonth = starTime+"-01";


//                // 获取当前月份的最后一天


                String lastDayOfMonth = sdf.format(lastDay);




                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");


                financeNum=baseMapper.getThreeNum(streetId,communityId,"财务公开",firstDayOfMonth+" 00:00:00",lastDayOfMonth+" 23:59:59");


                fundNum=baseMapper.getThreeNum(streetId,communityId,"资金公开",firstDayOfMonth+" 00:00:00",lastDayOfMonth+" 23:59:59");


                propertyNum=baseMapper.getThreeNum(streetId,communityId,"资产公开",firstDayOfMonth+" 00:00:00",lastDayOfMonth+" 23:59:59");


                naturalResourcesNum=baseMapper.getThreeNum(streetId,communityId,"资源公开",firstDayOfMonth+" 00:00:00",lastDayOfMonth+" 23:59:59");


                villageEconomyNum=baseMapper.getThreeNum(streetId,communityId,"村集体经济组织项目",firstDayOfMonth+" 00:00:00",lastDayOfMonth+" 23:59:59");




            } catch (ParseException e) {


                e.printStackTrace();


            }




            // 获取并打印第一天的日期










        }


        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"))


        {


@@ -238,8 +267,8 @@


        threeNumData.setNaturalResourcesNum(naturalResourcesNum);


        threeNumData.setVillageEconomyNum(villageEconomyNum);




        threeNumData.setThreeFundNum(partyAffairsNum+serviceNum+financeNum);


        threeNumData.setThreeServiceNum(fundNum+propertyNum+naturalResourcesNum);


        threeNumData.setThreeServiceNum(partyAffairsNum+serviceNum+financeNum);


        threeNumData.setThreeFundNum(fundNum+propertyNum+naturalResourcesNum);






        return R.ok(threeNumData);


@@ -280,35 +309,49 @@


        //报到党员总计数据


        Integer MemberNum=0;




        Integer fuwuNum=0;




        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");




            fuwuNum=baseMapper.getRegistNum(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");


            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");


            Date date = null;


            try {


                date = sdf.parse(starTime+"-01");


            } catch (ParseException e) {


                e.printStackTrace();


            }


            Calendar calendar = Calendar.getInstance();


            calendar.setTime(date);


            calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMaximum(Calendar.DAY_OF_MONTH));


            Date lastDay = calendar.getTime();


            // 获取当前月份的第一天


            String firstDayOfMonth = LocalDate.now().with(TemporalAdjusters.firstDayOfMonth()).format(formatter);


            // 获取当前月份的最后一天


            String lastDayOfMonth = LocalDate.now().with(TemporalAdjusters.lastDayOfMonth()).format(formatter);


            String firstDayOfMonth = starTime+"-01";


//                // 获取当前月份的最后一天


            String lastDayOfMonth = sdf.format(lastDay);




            //旧的报道需求问题统计数  2.问题清单 3.需求清单


            OleProblemNum=baseMapper.getOleNeedProblemNum("2",streetId,communityId,firstDayOfMonth+" 00:00:00",lastDayOfMonth+" 23:59:59");


@@ -326,29 +369,31 @@


            UnitNum=baseMapper.getUnitNum(streetId,communityId,firstDayOfMonth+" 00:00:00",lastDayOfMonth+" 23:59:59");


            //报到党员总计数据


            MemberNum=baseMapper.getMemberNum(streetId,communityId,firstDayOfMonth+" 00:00:00",lastDayOfMonth+" 23:59:59");


            fuwuNum=baseMapper.getRegistNum(streetId,communityId,firstDayOfMonth+" 00:00:00",lastDayOfMonth+" 23:59:59");


        }


        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");


            fuwuNum=baseMapper.getRegistNum(streetId,communityId,starTime+" 00:00:00",starTime+" 23:59:59");


        }


        else if(StringUtils.equals(type,"4"))


        {


@@ -369,6 +414,7 @@


            UnitNum=baseMapper.getUnitNum(streetId,communityId,starTime+" 00:00:00",endTime+" 23:59:59");


            //报到党员总计数据


            MemberNum=baseMapper.getMemberNum(streetId,communityId,starTime+" 00:00:00",endTime+" 23:59:59");


            fuwuNum=baseMapper.getRegistNum(streetId,communityId,starTime+" 00:00:00",endTime+" 23:59:59");




        }


        else


@@ -389,8 +435,18 @@


            UnitNum=baseMapper.getUnitNum(streetId,communityId,null,null);


            //报到党员总计数据


            MemberNum=baseMapper.getMemberNum(streetId,communityId,null,null);


            fuwuNum=baseMapper.getRegistNum(streetId,communityId,null,null);


        }






        if(NewTime==null)


        {


            NewTime=0.0;


        }


        if(OldTime==null)


        {


            OldTime=0.0;


        }




        DoubleRegistrationData doubleRegistrationData=new DoubleRegistrationData();


        //报道需求统计数


@@ -405,8 +461,8 @@


        doubleRegistrationData.setUnitNum(UnitNum);


        //报到党员总计数据


        doubleRegistrationData.setMemberNum(MemberNum);




        doubleRegistrationData.setAllNum(NewNeedNum+OleNeedNum+OleProblemNum+NewProblemNum);


        //报到服务次数


        doubleRegistrationData.setAllNum(NewNeedNum+OleNeedNum+OleProblemNum+NewProblemNum+fuwuNum);






        return R.ok(doubleRegistrationData);


@@ -440,28 +496,37 @@


        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");


            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");


            Date date = null;


            try {


                date = sdf.parse(starTime+"-01");


            } catch (ParseException e) {


                e.printStackTrace();


            }


            Calendar calendar = Calendar.getInstance();


            calendar.setTime(date);


            calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMaximum(Calendar.DAY_OF_MONTH));


            Date lastDay = calendar.getTime();


            // 获取当前月份的第一天


            String firstDayOfMonth = LocalDate.now().with(TemporalAdjusters.firstDayOfMonth()).format(formatter);


            // 获取当前月份的最后一天


            String lastDayOfMonth = LocalDate.now().with(TemporalAdjusters.lastDayOfMonth()).format(formatter);


            String firstDayOfMonth = starTime+"-01";


//                // 获取当前月份的最后一天


            String lastDayOfMonth = sdf.format(lastDay);




            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");


@@ -470,14 +535,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"))


        {


@@ -581,40 +646,50 @@


        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");






        }


        else if(StringUtils.equals(type,"2"))


        {


            //按月份


            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");


            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");


            Date date = null;


            try {


                date = sdf.parse(starTime+"-01");


            } catch (ParseException e) {


                e.printStackTrace();


            }


            Calendar calendar = Calendar.getInstance();


            calendar.setTime(date);


            calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMaximum(Calendar.DAY_OF_MONTH));


            Date lastDay = calendar.getTime();


            // 获取当前月份的第一天


            String firstDayOfMonth = LocalDate.now().with(TemporalAdjusters.firstDayOfMonth()).format(formatter);


            // 获取当前月份的最后一天


            String lastDayOfMonth = LocalDate.now().with(TemporalAdjusters.lastDayOfMonth()).format(formatter);


            String firstDayOfMonth = starTime+"-01";


//                // 获取当前月份的最后一天


            String lastDayOfMonth = sdf.format(lastDay);




            //* 社区活动统计


            nommunityActNumList=baseMapper.getNommunityActNumList("%Y-%m",streetId,communityId,firstDayOfMonth+" 00:00:00",lastDayOfMonth+" 23:59:59");


@@ -629,32 +704,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");