From f249e12963f9512a5d665eb57a1e5440c156bd85 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期五, 08 七月 2022 17:17:56 +0800
Subject: [PATCH] update
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java | 36 ++----------------------------------
1 files changed, 2 insertions(+), 34 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java
index 351ec42..2245a9e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java
+++ b/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);
}
--
Gitblit v1.7.1