From c40f8e3d2e08e108780091776437242528bf61d6 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期三, 20 七月 2022 17:44:56 +0800
Subject: [PATCH] bug修改
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 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 a4fb969..826137d 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
@@ -3463,8 +3463,8 @@
}
}
if (ObjectUtils.isEmpty(range)){
- //查看累计数据时才计算其他用户的比例
- final Boolean flag=(type.equals(ALLSTREET) || type.equals(ALLCOMMUNITY) || type.equals(BYSTREET) || type.equals(BYAREA));
+ //查看累计数据时才计算其他用户的比例 || type.equals(BYSTREET) || type.equals(BYAREA))
+ final Boolean flag=(type.equals(ALLSTREET) || type.equals(ALLCOMMUNITY));
if (flag){
UserRateAnalysisVO vo=new UserRateAnalysisVO();
vo.setName(OTHERUSER);
@@ -3478,7 +3478,6 @@
userRate.setUserList(userRateAnalysisVOList);
return R.ok(userRate);
}
-
@Override
public R realUser(Integer type, Long streetId, Long areaCode, Integer range) {
@@ -3510,9 +3509,11 @@
realUserVO.setRealUserRate(rate.doubleValue());
}
for (RealUser realUser : realUsers) {
- if (org.apache.commons.lang3.ObjectUtils.isNotEmpty(realUser)){
- if (realUser.getCommunityId().equals("11")){
- continue;
+ if (!(type.equals(ALLCOUNTY))){
+ if (org.apache.commons.lang3.ObjectUtils.isNotEmpty(realUser)){
+ if (realUser.getCommunityId().equals("11")){
+ continue;
+ }
}
}
RealUserAnalysisVO vo=new RealUserAnalysisVO();
@@ -3598,7 +3599,6 @@
}
return R.ok();
}
-
@Override
public R getAreaAndStreet() {
List<Integer> areaCodeList=areaCodeList();
@@ -3612,6 +3612,7 @@
}
return R.ok(areaVOList);
}
+
/**
* 获取最近20天数据
@@ -3728,6 +3729,7 @@
break;
case "510402":
name="东区";
+ break;
case "510411":
name="仁和区";
break;
@@ -3745,6 +3747,7 @@
*根据type选择要设置的名称
* */
private String typeToName(Integer type,UserProportion proportion){
+ log.info("当前code"+proportion.getAreaCode());
String name="";
if (type.equals(ALLCOUNTY)){
name=areaCodeToName(proportion.getAreaCode());
--
Gitblit v1.7.1