From 33317fcf48a2b659c2e88e9063eccaa3a8512250 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 18 八月 2022 11:49:44 +0800
Subject: [PATCH] bug修改
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 64aa009..3e4debd 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
@@ -2928,9 +2928,9 @@
page.setSize(20L);
}
if(dataKanBansDto.getType() != null && dataKanBansDto.getType().equals(DataKanBansDto.type.by)){
- dataKanbanDTOS = userDao.selectCommunityUserOrderMonth(page, dataKanBansDto.getAreaCode()).getRecords();
+ dataKanbanDTOS = userDao.selectCommunityUserOrderMonth(page, dataKanBansDto.getAppId()).getRecords();
}else{
- dataKanbanDTOS = userDao.selectCommunityUserOrder(page, dataKanBansDto.getAreaCode()).getRecords();
+ dataKanbanDTOS = userDao.selectCommunityUserOrder(page, dataKanBansDto.getAppId()).getRecords();
}
if (!ObjectUtils.isEmpty(dataKanbanDTOS)) {
dataKanbanDTOS.forEach(dataKanbanDTO -> {
@@ -2943,7 +2943,7 @@
List<Date> serverndays = com.panzhihua.common.utlis.DateUtils.getOldDays();
serverndays.forEach(date -> {
// 查询社区活动数量
- DataKanbanDTO dataKanbanDTO = userDao.selectCommunityAddUserOrder(dataKanBansDto.getAreaCode(),date);
+ DataKanbanDTO dataKanbanDTO = userDao.selectCommunityAddUserOrder(dataKanBansDto.getAppId(),date);
communityActiveUserX.add(DateFormatUtils.format(date, "MM-dd"));
communityActiveUserY.add(dataKanbanDTO.getNum());
communityActiveUserZ.add(dataKanbanDTO.getDayNum());
@@ -3299,8 +3299,8 @@
}
@Override
- public R newIndexData(Integer type, Long streetId,Long areaCode) {
- IndexDataKanbanVO indexDataKanbanVO = userDao.selectIndexDataKanban(null);
+ public R newIndexData(Integer type, Long streetId,Long areaCode,String appId) {
+ IndexDataKanbanVO indexDataKanbanVO = userDao.selectIndexDataKanban(appId);
IndexDataAnalysisVO vo=new IndexDataAnalysisVO();
if (ObjectUtils.isEmpty(type)){
//不传默认为所有区县
--
Gitblit v1.7.1