商业街bug修改

puhanshu

2022-01-14 51ee3c4db2eb49062d3236bf44f95dc22f8f6ac9

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenServiceImpl.java

@@ -5,6 +5,8 @@

import javax.annotation.Resource;

import com.panzhihua.common.utlis.SensitiveUtil;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.dao.ComPbMemberDAO;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -51,25 +53,28 @@
        BigScreenStatisticAgeGender age = bigScreenDAO.age(bigScreenStatisticAgeGenderDTO);

        BigScreenStatisticAgeGender ageGender = new BigScreenStatisticAgeGender();
        BeanUtils.copyProperties(age, ageGender);
        ageGender.setManTotal(gender.getManTotal());
        ageGender.setWomeTotal(gender.getWomeTotal());
        if(age!=null){
            BeanUtils.copyProperties(age, ageGender);
            ageGender.setManTotal(gender.getManTotal());
            ageGender.setWomeTotal(gender.getWomeTotal());

        /**
         * 计算百分比
         */
        Double manPer = 1.0 * ageGender.getManTotal() / (ageGender.getManTotal() + ageGender.getWomeTotal());
        Double womenPer = 1.0 * ageGender.getWomeTotal() / (ageGender.getManTotal() + ageGender.getWomeTotal());
        ageGender.setManPer(manPer);
        ageGender.setWomenPer(womenPer);
            /**
             * 计算百分比
             */
            Double manPer = 1.0 * ageGender.getManTotal() / (ageGender.getManTotal() + ageGender.getWomeTotal());
            Double womenPer = 1.0 * ageGender.getWomeTotal() / (ageGender.getManTotal() + ageGender.getWomeTotal());
            ageGender.setManPer(manPer);
            ageGender.setWomenPer(womenPer);

        Integer memTotal = ageGender.getThirtyTotal() + ageGender.getSixtyTotal() + ageGender.getBiggerTotal();
        Double thrPer = 1.0 * ageGender.getThirtyTotal() / memTotal;
        Double sixPer = 1.0 * ageGender.getSixtyTotal() / memTotal;
        Double biggerPer = 1.0 * ageGender.getBiggerTotal() / memTotal;
        ageGender.setThirtyPer(thrPer);
        ageGender.setSixtyPer(sixPer);
        ageGender.setBiggerPer(biggerPer);
            Integer memTotal = ageGender.getThirtyTotal() + ageGender.getSixtyTotal() + ageGender.getBiggerTotal();
            Double thrPer = 1.0 * ageGender.getThirtyTotal() / memTotal;
            Double sixPer = 1.0 * ageGender.getSixtyTotal() / memTotal;
            Double biggerPer = 1.0 * ageGender.getBiggerTotal() / memTotal;
            ageGender.setThirtyPer(thrPer);
            ageGender.setSixtyPer(sixPer);
            ageGender.setBiggerPer(biggerPer);
        }

        return R.ok(ageGender);
    }

@@ -89,6 +94,11 @@
                listRt = listRt.subList(0, 3);
            }
        }
        listRt.forEach(partyBuildingMemberVO -> {
            if(StringUtils.isNotEmpty(partyBuildingMemberVO.getName())){
                partyBuildingMemberVO.setName(SensitiveUtil.replaceName(partyBuildingMemberVO.getName()));
            }
        });
        return R.ok(listRt);
    }

@@ -116,8 +126,8 @@
    }

    @Override
    public R partyActivityTop(Long communityId) {
        return R.ok(this.comPbMemberDAO.selectActivityTop(communityId));
    public R partyActivityTop(PageBigScreenStatisticPartyOrg pageBigScreenStatisticPartyOrg) {
        return R.ok(this.comPbMemberDAO.selectActivityTop(new Page(pageBigScreenStatisticPartyOrg.getPageNum(),pageBigScreenStatisticPartyOrg.getPageSize()),pageBigScreenStatisticPartyOrg.getCommunityId()));
    }

    @Override