From 5b6552d241b1d6c541fd1ceeab5594882b74f034 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期五, 08 七月 2022 14:35:27 +0800
Subject: [PATCH] update
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
index fc0c81e..551fe6a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -3374,8 +3374,8 @@
vo.setActiveUserYMonth(activeUserYMonth);
if (type.equals(BYSTREET) || type.equals(ALLCOMMUNITY) || type.equals(ALLSTREET)){
//获取其他用户
- vo.setOtherUser(indexDataKanbanVO.getAllUser()-vo.getAllUser());
- vo.setOtherUserRate(getRate(indexDataKanbanVO.getAllUser(),vo.getAllUser()));
+ vo.setOtherUser(indexDataKanbanVO.getAllUser()-countUser(vo.getUserProportionTotal()));
+ vo.setOtherUserRate(getRate(indexDataKanbanVO.getAllUser(),vo.getOtherUser()));
}
return R.ok(vo);
}
@@ -3451,4 +3451,21 @@
return count;
}
+ /**
+ * 计算当前统计范围内的所有用户数
+ * */
+ public Integer countUser(List<UserProportion> list){
+ Integer count=0;
+ if (list.size()>0){
+ for (UserProportion proportion : list) {
+ if (org.apache.commons.lang3.ObjectUtils.isNotEmpty(proportion)){
+ if (org.apache.commons.lang3.ObjectUtils.isNotEmpty(proportion.getUser())){
+ count+=proportion.getUser();
+ }
+ }
+ }
+ }
+ return count;
+ }
+
}
--
Gitblit v1.7.1