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:28:55 +08:00
parent 83f2dcb7c0
commit 9ad46e8943
2 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -146,13 +146,29 @@ public class FranchiseReportServiceImpl implements FranchiseReportService {
return Collections.emptyList(); return Collections.emptyList();
} }
sortByName(list); sortByName(list);
if(CollectionUtils.isEmpty(request.getJoinGroupName()) && CollectionUtils.isEmpty(request.getRegionIds())){ // if(CollectionUtils.isEmpty(request.getJoinGroupName()) && CollectionUtils.isEmpty(request.getRegionIds())){
//集团维度 // //集团维度
List<FranchiseReportResponse> joinGroupList = new ArrayList<>(); // List<FranchiseReportResponse> joinGroupList = new ArrayList<>();
Map<String, FranchiseReportResponse> listMap = list.stream().collect(Collectors.toMap(FranchiseReportResponse::getJoinGroupName, Function.identity())); // Map<String, FranchiseReportResponse> listMap = list.stream().collect(Collectors.toMap(FranchiseReportResponse::getJoinGroupName, Function.identity()));
// }
} List<FranchiseReportResponse> ab = new ArrayList<FranchiseReportResponse>();
return 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);
ab.addAll(list);
return ab;
} }
public static void sortByName(List<FranchiseReportResponse> list) { public static void sortByName(List<FranchiseReportResponse> list) {

7
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCFranchiseReportController.java
View File

File diff suppressed because one or more lines are too long