花城 处理街道大屏报道服务问题

lidongdong

2024-10-08 9e17b7fb1116e1cbe503ada5a83355282c15c2f4

花城 处理街道大屏报道服务问题

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/StreetBigScreenDAO.java

@@ -151,6 +151,20 @@


    /**
     * 获取服务次数
     * @param streetId
     * @param communityId
     * @param starTime
     * @param endTime
     * @return
     */
    Integer getRegistNum(@Param("streetId") String streetId,
                         @Param("communityId") String communityId,
                         @Param("starTime") String starTime,
                         @Param("endTime") String endTime);


    /**
     * 党建动态数据
     * @param streetId
     * @param communityId

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

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/StreetBigScreenMapper.xml

@@ -173,6 +173,34 @@

    </select>



    <select id="getRegistNum" resultType="Integer">
        select count(id)  from com_act_act_regist where start_time is not null and end_time is not null and
            activity_id in (
            select id from com_act_activity where
                1=1
                <if test=" communityId !=null and communityId != '' ">
                    and community_id in  ( #{communityId} )
                </if>
                <if test=" communityId == null and streetId !=null and streetId != '' ">
                    and community_id in (select community_id from com_act where street_id=#{streetId} and app_id="wx118de8a734d269f0")
                </if>
                <if test="starTime != null and starTime != '' ">
                    and create_at BETWEEN #{starTime} AND #{endTime}
                </if>
        )

    </select>









    <!--  党建动态数据  -->
    <select id="getPartyBuildingNum" resultType="Integer">
        select count(id) from com_pb_dyn