From 8ef6cc463ec3e1c7f7164bcfe19c383214cb5db4 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期一, 11 七月 2022 09:25:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_zts
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 7 ++++++-
1 files changed, 6 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 b107f57..f672605 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
@@ -3357,7 +3357,12 @@
vo.setRealUsersMonth(realUsersMonth);
vo.setRealUser(getStreetRealUser(realUsersTotal));
vo.setRealUserRate(getRate(vo.getAllUser(),vo.getRealUser()));
- vo.setUserActivityXAll(getTwentyDays());
+ List<Date> twentyDays = getTwentyDays();
+ SimpleDateFormat sdf1=new SimpleDateFormat("MM");
+ for (Date twentyDay : twentyDays) {
+ sdf1.format(twentyDay);
+ }
+ vo.setUserActivityXAll(getTwentyDays());
vo.setUserActivityXMonth(getMonthTwentyDays());
List<String> addUserYAll=new ArrayList<>();
List<String> addUserYMonth=new ArrayList<>();
--
Gitblit v1.7.1