mitao
2025-05-20 179c4d64313c9b7572778da4aaaf6c6584fe457d
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/StreetBigScreenServiceImpl.java
@@ -309,6 +309,8 @@
        //报到党员总计数据
        Integer MemberNum=0;
        Integer fuwuNum=0;
        if(StringUtils.equals(type,"1"))
        {
            //按年份
@@ -329,6 +331,8 @@
            UnitNum=baseMapper.getUnitNum(streetId,communityId,starTime+"-01-01 00:00:00",starTime+"-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"))
        {
@@ -365,6 +369,7 @@
            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"))
        {
@@ -388,6 +393,7 @@
            UnitNum=baseMapper.getUnitNum(streetId,communityId,starTime+" 00:00:00",starTime+" 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"))
        {
@@ -408,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
@@ -428,6 +435,7 @@
            UnitNum=baseMapper.getUnitNum(streetId,communityId,null,null);
            //报到党员总计数据
            MemberNum=baseMapper.getMemberNum(streetId,communityId,null,null);
            fuwuNum=baseMapper.getRegistNum(streetId,communityId,null,null);
        }
@@ -453,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);