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

huanghongfa

2021-07-22 02f18587bd8860b305e2c688e20465be166bb48c

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

@@ -15,6 +15,7 @@
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;

/**
@@ -76,7 +77,7 @@
    @Override
    public R<List<PartyBuildingMemberVO>> bigscreenPartyactivitytopuser(Long communityId) {
        List<PartyBuildingMemberVO> listRt = bigScreenDAO.bigscreenPartyactivitytopuser(communityId);
        if(listRt==null || listRt.size()< 0){
        if(listRt==null || listRt.size()< 3){
            //选择默认的党员列表
            List<PartyBuildingMemberVO>  defaultPartyactivity = bigScreenDAO.defaultPartyactivity(communityId);
            listRt.addAll(defaultPartyactivity);
@@ -89,7 +90,12 @@

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