From 882338c1be89f7293c29eb35728de1d86178c9d3 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期三, 13 七月 2022 12:26:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_zts' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 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 2e54d19..ff2d2bf 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
@@ -3435,7 +3435,12 @@
}
List<UserProportion> userProportions = userDao.userAnalysis(type, date, streetId,areaCode);
List<UserRateAnalysisVO> userRateAnalysisVOList=new ArrayList<>();
- final Boolean monthRange=range.equals(1);
+ Boolean monthRange=false;
+ if (org.apache.commons.lang3.ObjectUtils.isNotEmpty(range)){
+ if (range.equals(1)){
+ monthRange=true;
+ }
+ }
if (userProportions.size()>0){
for (UserProportion userProportion : userProportions) {
if (org.apache.commons.lang3.ObjectUtils.isNotEmpty(userProportion)){
@@ -3641,6 +3646,7 @@
return dateList;
}
+
/**
* areaCode转区县名
* */
--
Gitblit v1.7.1