bug修改

101captain

2022-07-20 d50ef0ec94f90ddf92bcd42671aa62ae38df81b9

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

@@ -724,8 +724,10 @@
        AdministratorsUserVO user = this.baseMapper.selectUserByUserId(comActNeighborCircleDO.getReleaseId());
        DetailNeighborCircleAdminVO vo = new DetailNeighborCircleAdminVO();
        BeanUtils.copyProperties(comActNeighborCircleDO, vo);
        vo.setReleaseName(user.getName());
        vo.setImageUrl(user.getImageUrl());
        if(user!=null){
            vo.setReleaseName(user.getName());
            vo.setImageUrl(user.getImageUrl());
        }
        if(comActNeighborCircleDO.getOrderType()!=null){
            if(comActNeighborCircleDO.getOrderType()==2){
                AdministratorsUserVO user1 = this.baseMapper.selectUserByUserId(comActNeighborCircleDO.getSolveId());
@@ -1051,9 +1053,9 @@
        activityVO.setPartyMemberCount(comActDAO.selectUnitCount());
        activityVO.setUnitCount(comActDAO.selectMemberCount());
        //获取单位活动统计数据（邻里圈）
        List<UnitActivityAnalysisVO> unitActivityAnalysisVOS = comActNeighborCircleDAO.institutionalUnitServiceAnalysis(beginTime, endTime, belongTo);
        List<UnitActivityAnalysisVO> unitActivityAnalysisVOS = comActNeighborCircleDAO.institutionalUnitServiceAnalysis(beginTime, endTime, belongTo,communityId);
        //获取单位活动统计数据（活动）
        List<UnitActivityAnalysisVO> unitActivityAnalysisVOS1 = comActNeighborCircleDAO.institutionalUnitActivityAnalysis(beginTime, endTime, belongTo);
        List<UnitActivityAnalysisVO> unitActivityAnalysisVOS1 = comActNeighborCircleDAO.institutionalUnitActivityAnalysis(beginTime, endTime, belongTo,communityId);
        if (unitActivityAnalysisVOS.size()>0){
            for (UnitActivityAnalysisVO unitActivityAnalysisVO : unitActivityAnalysisVOS){
                if (ObjectUtils.isNotEmpty(unitActivityAnalysisVO)){
@@ -1113,7 +1115,6 @@
                }
            }
        }

        //统计总时长和总次数
        Integer unitServiceCount=0;
        Integer unitServiceTotalTime=0;
@@ -1157,12 +1158,6 @@
//                ListUtil.sortByProperty(partyMemberAnalysisVOS, "serviceTimes");
//            }
//        }
        //统一进行排序，避免统计之后顺序混乱
        ListUtil.sortByProperty(unitActivityAnalysisVOS, "serviceTime");
        partyMemberAnalysisVOS = ListUtil.sortByProperty(partyMemberAnalysisVOS, "serviceTime");
        //执行倒序
        Collections.reverse(unitActivityAnalysisVOS);
        Collections.reverse(partyMemberAnalysisVOS);
        //处理分页
        PageVO<List<UnitActivityAnalysisVO>> unitPage=new PageVO<>();
        PageVO<List<PartyMemberAnalysisVO>> memberPage=new PageVO<>();
@@ -1182,34 +1177,8 @@
            unitPage.setRecords(unitActivityAnalysisVOS);
            memberPage.setRecords(partyMemberAnalysisVOS);
        }
        activityVO.setUnitListByTime(unitPage);
        activityVO.setPartyMemberListByTime(memberPage);
        List<UnitActivityAnalysisVO> unitActivityAnalysisVOTimes=unitActivityAnalysisVOS;
        List<PartyMemberAnalysisVO> partyMemberAnalysisVOTimes=partyMemberAnalysisVOS;
        ListUtil.sortByProperty(unitActivityAnalysisVOTimes, "serviceTimes");
        ListUtil.sortByProperty(partyMemberAnalysisVOTimes, "serviceTimes");
        Collections.reverse(unitActivityAnalysisVOTimes);
        Collections.reverse(partyMemberAnalysisVOTimes);
        PageVO<List<UnitActivityAnalysisVO>> unitPage1=new PageVO<>();
        PageVO<List<PartyMemberAnalysisVO>> memberPage1=new PageVO<>();
        if (ObjectUtils.isNotEmpty(page) && ObjectUtils.isNotEmpty(size)){
            //分页处理
            unitPage1.setRecordsCount(unitActivityAnalysisVOS.size());
            unitPage1.setPage(page);
            unitPage1.setPages(getPages(unitPage.getRecordsCount(),size ));
            memberPage1.setPage(page);
            memberPage1.setRecordsCount(partyMemberAnalysisVOS.size());
            memberPage1.setPages(getPages(memberPage.getRecordsCount(), size));
            //处理分页的结果
            unitPage1.setRecords(subUnitList((ArrayList) unitActivityAnalysisVOTimes, page,size));
            memberPage1.setRecords(subUnitList((ArrayList)partyMemberAnalysisVOTimes,page ,size));

        }else {
            unitPage1.setRecords(unitActivityAnalysisVOS);
            memberPage1.setRecords(partyMemberAnalysisVOS);
        }
        activityVO.setPartyMemberByTimes(memberPage1);
        activityVO.setUnitListByTimes(unitPage1);
        activityVO.setUnitList(unitPage);
        activityVO.setPartyMemberList(memberPage);
        return R.ok(activityVO);

    }