From c168f544ecd041760e7d0fba66c48e06b9ab67dc Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 05 十二月 2022 16:51:21 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java
index 724f734..a830e49 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java
@@ -336,13 +336,11 @@
@Override
public R statisticsPbMemberType(){
List<ComPbMemberTypeVO> comPbMemberTypeVOS = comPbMemberDAO.statisticsPbMemberType();
- Map<String, Integer> retMap = comPbMemberTypeVOS.stream().collect(Collectors.toMap(ComPbMemberTypeVO::getCountName, ComPbMemberTypeVO::getCountNum));
- return R.ok(retMap);
+ return R.ok(comPbMemberTypeVOS);
}
public R selectUnitByNatureName(){
List<ComPbMemberTypeVO> comPbMemberTypeVOS = comPbMemberDAO.selectUnitByNatureName();
- Map<String, Integer> retMap = comPbMemberTypeVOS.stream().collect(Collectors.toMap(ComPbMemberTypeVO::getCountName, ComPbMemberTypeVO::getCountNum));
- return R.ok(retMap);
+ return R.ok(comPbMemberTypeVOS);
}
}
--
Gitblit v1.7.1