update

张天森

2022-07-08 f249e12963f9512a5d665eb57a1e5440c156bd85

update

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ActivityAnalysisVO.java

@@ -15,16 +15,10 @@
    private Integer partyMemberCount;

    @ApiModelProperty("单位统计数据列表（时长倒序）")
    private PageVO<List<UnitActivityAnalysisVO>> unitListByTime;
    private PageVO<List<UnitActivityAnalysisVO>> unitList;

    @ApiModelProperty("党员统计数据列表（时长倒序）")
    private PageVO<List<PartyMemberAnalysisVO>> partyMemberListByTime;

    @ApiModelProperty("单位统计数据列表（次数倒序）")
    private PageVO<List<UnitActivityAnalysisVO>> unitListByTimes;

    @ApiModelProperty("党员统计数据列表（次数倒序）")
    private PageVO<List<PartyMemberAnalysisVO>> partyMemberByTimes;
    private PageVO<List<PartyMemberAnalysisVO>> partyMemberList;

    @ApiModelProperty("机关单位服务总次数")
    private Integer unitServiceTotalCount;

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

@@ -1127,12 +1127,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<>();
@@ -1152,34 +1146,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);

    }

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java

@@ -3349,6 +3349,11 @@
            vo.setRealUsersMonth(realUsersMonth);
            vo.setRealUser(getStreetRealUser(realUsersTotal));
            vo.setRealUserRate(getRate(vo.getAllUser(),vo.getRealUser()));
        List<Date> twentyDays = getTwentyDays();
        SimpleDateFormat sdf1=new SimpleDateFormat("MM");
        for (Date twentyDay : twentyDays) {
            sdf1.format(twentyDay);
        }
            vo.setUserActivityXAll(getTwentyDays());
            vo.setUserActivityXMonth(getMonthTwentyDays());
            List<String> addUserYAll=new ArrayList<>();