Merge remote-tracking branch 'origin/zzj' into zzj

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

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

@@ -1,22 +1,24 @@
package com.panzhihua.service_community.service.impl;

import java.util.ArrayList;
import java.util.List;

import javax.annotation.Resource;

import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenStatisticAgeGenderDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenStatisticPartyActivityDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.PageBigScreenStatisticPartyOrg;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.EldersAuthVO;
import com.panzhihua.common.model.vos.community.bigscreen.*;
import com.panzhihua.service_community.dao.BigScreenDAO;
import com.panzhihua.service_community.service.BigScreenService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import lombok.extern.slf4j.Slf4j;

/**
 * @ClasssName BigScreenService
@@ -49,7 +51,6 @@
        BeanUtils.copyProperties(age, ageGender);
        ageGender.setManTotal(gender.getManTotal());
        ageGender.setWomeTotal(gender.getWomeTotal());


        /**
         * 计算百分比
@@ -89,7 +90,8 @@
    }

    @Override
    public R<List<BigScreenStatisticPartyActivity>> bigscreenPartyactivity(BigScreenStatisticPartyActivityDTO bigScreenStatisticPartyActivityDTO) {
    public R<List<BigScreenStatisticPartyActivity>>
        bigscreenPartyactivity(BigScreenStatisticPartyActivityDTO bigScreenStatisticPartyActivityDTO) {
        List<BigScreenStatisticPartyActivity> listR = new ArrayList<>();
        if(bigScreenStatisticPartyActivityDTO.getType().equals(3)){
            listR = bigScreenDAO.partyactivity(bigScreenStatisticPartyActivityDTO);