看板bug修改

张天森

2022-07-14 3590d2179e3aaa8c274f58fdd6943088a6dbf8b5

看板bug修改

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java

@@ -3445,17 +3445,18 @@
            for (UserProportion userProportion : userProportions) {
                if (org.apache.commons.lang3.ObjectUtils.isNotEmpty(userProportion)){
                    UserRateAnalysisVO vo=new UserRateAnalysisVO();
                    vo.setName(typeToName(type,userProportion ));
                    if (monthRange){
                        if (userProportion.getCommunityId().equals("11")){
                            continue;
                        }
                        //获取本月的用户总数作为计算占比的用户总数
                        IndexDataKanbanVO data = userDao.dataKanBanStreet(streetId, areaCode, date);
                        //IndexDataKanbanVO data = userDao.dataKanBanStreet(streetId, areaCode, date);
                        Integer monthUsers = userDao.getMonthUsers(streetId, areaCode, date);
                        log.info("总人数----"+data.getAllUser());
                        log.info("人数-----"+userProportion.getUser());
                        vo.setRate(getRate(monthUsers,userProportion.getUser()));
                    }else{
                        vo.setRate(getRate(analysisVO.getAllUser(),userProportion.getUser()));
                    }
                    vo.setName(typeToName(type,userProportion ));
                    vo.setCount(userProportion.getUser());
                    userRateAnalysisVOList.add(vo);
                }

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/UserDao.xml

@@ -564,7 +564,7 @@
        select check_unit_id from com_pb_member where phone = #{phone} limit 1
    </select>
    <select id="userAnalysis" resultType="com.panzhihua.common.model.vos.user.UserProportion">
        select cs.area_code,cs.name as streetName,ac.name as communityName,count(su.user_id) as user from sys_user as su
        select cs.area_code,cs.name as streetName,ac.name as communityName,count(su.user_id) as user,su.community_id as communityId from sys_user as su
        left join com_act as ac on su.community_id=ac.community_id
        left join com_street as cs on ac.street_id=cs.street_id
        where su.community_id&lt;>''
@@ -695,6 +695,7 @@
        FROM
        sys_user t LEFT JOIN com_act t1 on t.community_id = t1.community_id
        where t.type=1 and t.community_id is not null
        and t.community_id&lt;>11
        <if test="streetId != null">
            and t1.street_id=#{streetId}
        </if>