From 5f4018c7ab5a13c5f3ae5a0155a121e150f4ad74 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 14 七月 2022 14:15:33 +0800
Subject: [PATCH] Merge branch 'huacheng_test' into huacheng_zts
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 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..89a5ad9 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
@@ -3444,6 +3444,7 @@
if (userProportions.size()>0){
for (UserProportion userProportion : userProportions) {
if (org.apache.commons.lang3.ObjectUtils.isNotEmpty(userProportion)){
+ log.info("统计数据"+userProportion);
UserRateAnalysisVO vo=new UserRateAnalysisVO();
if (monthRange){
if (userProportion.getCommunityId().equals("11")){
@@ -3458,13 +3459,14 @@
}
vo.setName(typeToName(type,userProportion ));
vo.setCount(userProportion.getUser());
+ log.info("统计后数据+"+vo);
userRateAnalysisVOList.add(vo);
}
}
}
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);
@@ -3510,9 +3512,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();
@@ -3565,7 +3569,6 @@
vo.setActiveUserY(activeY);
return R.ok(vo);
}
-
@Override
public R uuPush(String washPhone,String phone,String washName,Integer orderStatus) {
@@ -3728,6 +3731,7 @@
break;
case "510402":
name="东区";
+ break;
case "510411":
name="仁和区";
break;
@@ -3745,6 +3749,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