suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

统计报表接口，数据梳理接口

Browse Source
This commit is contained in:
shuo.wang
2025-05-16 10:47:37 +08:00
parent 9ad46e8943
commit 234789f88f
1 changed files with 11 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseReportServiceImpl.java
View File

@@ -76,9 +76,17 @@ public class FranchiseReportServiceImpl implements FranchiseReportService {
List<BigRegionDO> bigRegionDOList = bigRegionDAO.getByRegionIdList(new ArrayList<>(regionSet));
Map<Long, BigRegionDO> bigRegionDOMap = bigRegionDOList.stream().collect(Collectors.toMap(BigRegionDO::getRegionId, bigRegionDO -> bigRegionDO));
Map<Long, FranchiseReportResponse> responseByRegionIdMap = new HashMap<>();
Map<String ,FranchiseReportResponse> responseByJoinGroupNameMap = new HashMap<>();
for (FranchiseReportDTO shopFranchiseReportDTO : shopFranchiseReportList) {
FranchiseReportResponse response = responseByRegionIdMap.get(shopFranchiseReportDTO.getRegionId());
FranchiseReportResponse response = new FranchiseReportResponse();
if(CollectionUtils.isEmpty(request.getJoinGroupName()) && CollectionUtils.isEmpty(request.getRegionIds())){
BigRegionDO bigRegionDO = bigRegionDOMap.get(shopFranchiseReportDTO.getRegionId());
response = responseByJoinGroupNameMap.get(bigRegionDO.getGroupName());
}
else {
response = responseByRegionIdMap.get(shopFranchiseReportDTO.getRegionId());
}
if (response == null) {
response = new FranchiseReportResponse();
response.setRegionId(shopFranchiseReportDTO.getRegionId());
@@ -146,29 +154,7 @@ public class FranchiseReportServiceImpl implements FranchiseReportService {
return Collections.emptyList();
}
sortByName(list);
// if(CollectionUtils.isEmpty(request.getJoinGroupName()) && CollectionUtils.isEmpty(request.getRegionIds())){
// //集团维度
// List<FranchiseReportResponse> joinGroupList = new ArrayList<>();
// Map<String, FranchiseReportResponse> listMap = list.stream().collect(Collectors.toMap(FranchiseReportResponse::getJoinGroupName, Function.identity()));
// }
List<FranchiseReportResponse> ab = new ArrayList<FranchiseReportResponse>();
ab.addAll(list);
ab.addAll(list);
ab.addAll(list);
ab.addAll(list);
ab.addAll(list);
ab.addAll(list);
ab.addAll(list);
ab.addAll(list);
ab.addAll(list);
ab.addAll(list);
ab.addAll(list);
ab.addAll(list);
ab.addAll(list);
ab.addAll(list);
ab.addAll(list);
ab.addAll(list);
return ab;
return list;
}
public static void sortByName(List<FranchiseReportResponse> list) {