Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuish...

101captain

2022-07-07 e43fd10c1a51be5809c361c24a2be138837b02b2

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

@@ -1073,13 +1073,27 @@
        Integer memberServiceCount=0;
        Integer memberServiceTotalTome=0;
        for (UnitActivityAnalysisVO vo : unitActivityAnalysisVOS) {
            //避免空指针
            if (ObjectUtils.isNotEmpty(vo)){
                if (ObjectUtils.isNotEmpty(vo.getServiceTime())){
            unitServiceCount+=vo.getServiceTime();
                }
                if (ObjectUtils.isNotEmpty(vo.getServiceTimes())){
            unitServiceTotalTime+=vo.getServiceTimes();
        }
            }
        }
        for (PartyMemberAnalysisVO vo : partyMemberAnalysisVOS) {
            //避免空指针
            if (ObjectUtils.isNotEmpty(vo)){
                if (ObjectUtils.isNotEmpty(vo.getServiceTime())){
            memberServiceCount+=vo.getServiceTime();
                }
                if (ObjectUtils.isNotEmpty(vo.getServiceTimes())){
            memberServiceTotalTome+=vo.getServiceTimes();
        }
            }
        }
        activityVO.setUnitServiceTotalCount(unitServiceCount);
        activityVO.setUnitServiceTotalTime(unitServiceTotalTime);
        activityVO.setPartyMemberServiceTotalCount(memberServiceCount);