From d726443ea4f2bf4104c8eb4700901278f6ca000b Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期三, 12 一月 2022 17:18:21 +0800
Subject: [PATCH] 仁和社区通代码提交
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 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 34d571b..7630fbd 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
@@ -318,7 +318,11 @@
loginUserInfoVO.setType(sysUserDO.getType());
loginUserInfoVO.setIsRealNamed(sysUserDO.getIdCard() != null);// 暂时 身份证判断实名制
if(sysUserDO.getCommunityId()!=null){
+ ComActVO comActVO = userDao.selectCommunity(sysUserDO.getCommunityId());
loginUserInfoVO.setCommunityId(sysUserDO.getCommunityId());
+ if(comActVO!=null){
+ loginUserInfoVO.setComActVO(comActVO);
+ }
}
List<SysRoleDO> roleDOList = roleDAO.selectByUserId(sysUserDO.getUserId());
Set<String> set = new HashSet<>();
@@ -365,6 +369,7 @@
ComActVO comActVO = userDao.selectCommunity(userCommunityId);
if (comActVO != null) {
loginUserInfoVO.setCommunityName(comActVO.getName());
+ loginUserInfoVO.setComActVO(comActVO);
}
}
if (!ObjectUtils.isEmpty(phone)) {
@@ -1707,9 +1712,9 @@
* @return 展示数据
*/
@Override
- public R dataKanban() {
- IndexDataKanbanVO indexDataKanbanVO = userDao.selectIndexDataKanban();
- List<DataKanbanDTO> dataKanbanDTOS = userDao.selectCommunityUserOrder();
+ public R dataKanban(String areaCode) {
+ IndexDataKanbanVO indexDataKanbanVO = userDao.selectIndexDataKanban(areaCode);
+ List<DataKanbanDTO> dataKanbanDTOS = userDao.selectCommunityUserOrder(areaCode);
List<String> communityUserX = new ArrayList<>();
List<Integer> communityUserY = new ArrayList<>();
@@ -2723,7 +2728,7 @@
*/
@Override
public R dataKanBans(DataKanBansDto dataKanBansDto){
- IndexDataKanbanVO indexDataKanbanVO = userDao.selectIndexDataKanban();
+ IndexDataKanbanVO indexDataKanbanVO = userDao.selectIndexDataKanban(dataKanBansDto.getAreaCode());
List<String> communityUserX = new ArrayList<>();
List<Integer> communityUserY = new ArrayList<>();
@@ -2733,9 +2738,9 @@
List<DataKanbanDTO> dataKanbanDTOS = null;
if(dataKanBansDto.getType() != null && dataKanBansDto.getType().equals(DataKanBansDto.type.by)){
- dataKanbanDTOS = userDao.selectCommunityUserOrderMonth();
+ dataKanbanDTOS = userDao.selectCommunityUserOrderMonth(dataKanBansDto.getAreaCode());
}else{
- dataKanbanDTOS = userDao.selectCommunityUserOrder();
+ dataKanbanDTOS = userDao.selectCommunityUserOrder(dataKanBansDto.getAreaCode());
}
if (!ObjectUtils.isEmpty(dataKanbanDTOS)) {
dataKanbanDTOS.forEach(dataKanbanDTO -> {
@@ -2748,7 +2753,7 @@
List<Date> serverndays = com.panzhihua.common.utlis.DateUtils.getOldDays();
serverndays.forEach(date -> {
// 查询社区活动数量
- DataKanbanDTO dataKanbanDTO = userDao.selectCommunityAddUserOrder(date);
+ DataKanbanDTO dataKanbanDTO = userDao.selectCommunityAddUserOrder(dataKanBansDto.getAreaCode(),date);
communityActiveUserX.add(DateFormatUtils.format(date, "MM-dd"));
communityActiveUserY.add(dataKanbanDTO.getNum());
communityActiveUserZ.add(dataKanbanDTO.getDayNum());
@@ -2766,11 +2771,11 @@
* @return 用户数据统计汇总
*/
@Override
- public R communityStatistics(){
+ public R communityStatistics(String areaCode){
//返回结果数据
IndexUserStatisticsVo userStatisticsVo = new IndexUserStatisticsVo();
//查询所有街道
- List<IndexUserStreetVo> streetList = userDao.getUserStreetList();
+ List<IndexUserStreetVo> streetList = userDao.getUserStreetList(areaCode);
streetList.forEach(street -> {
List<IndexUserCommunityVo> communityList = userDao.getUserCommunityList(street.getStreetId());
street.setCommunityList(communityList);
@@ -2780,8 +2785,8 @@
}
@Override
- public R communityStatisticsExport(){
- return R.ok(userDao.getUserCommunityExcelExport());
+ public R communityStatisticsExport(String areaCode){
+ return R.ok(userDao.getUserCommunityExcelExport(areaCode));
}
/**
--
Gitblit v1.7.1