From e959172a457f60c2e16b69f60e3404df5fdffcfe Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期五, 12 十一月 2021 16:54:23 +0800
Subject: [PATCH] 1112修改提交
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 41 +++++++++++++++++++++++++++++++++--------
1 files changed, 33 insertions(+), 8 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 8a4bad6..15fcbef 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
@@ -16,6 +16,7 @@
import cn.hutool.core.util.IdcardUtil;
import com.panzhihua.common.model.dtos.DataKanBansDto;
+import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.service_user.dao.*;
import com.panzhihua.service_user.model.dos.*;
import org.apache.commons.lang.time.DateFormatUtils;
@@ -58,8 +59,6 @@
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
-import com.panzhihua.common.model.vos.community.ComActVO;
-import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO;
import com.panzhihua.common.model.vos.grid.GridMemberVO;
import com.panzhihua.common.model.vos.grid.admin.GridMemberBuildingVO;
import com.panzhihua.common.model.vos.partybuilding.ActivityManagerVO;
@@ -325,6 +324,7 @@
}
loginUserInfoVO.setIsmemberrole(2);
loginUserInfoVO.setIsFourMember(2);
+ loginUserInfoVO.setIsCommunityWorker(2);
// 志愿者状态
String phone = sysUserDO.getPhone();
Long userCommunityId = sysUserDO.getCommunityId();
@@ -353,6 +353,7 @@
Integer isSysUser = userDao.selectCountSysUser(phone, userCommunityId);
if (countTeam != null && countTeam > 0) {
loginUserInfoVO.setIsmemberrole(1);
+ loginUserInfoVO.setIsCommunityWorker(1);
} else if (selectCountMemberRole != null && selectCountMemberRole > 0) {
loginUserInfoVO.setIsmemberrole(1);
} else if (isSysUser != null && isSysUser > 0) {
@@ -2588,10 +2589,6 @@
if (nonNull(sysUserDO)) {
return R.fail("账户已经存在");
}
- sysUserDO = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getPhone, convenientMerchantDTO.getPhone()));
- if (nonNull(sysUserDO)) {
- return R.fail("手机号已经存在");
- }
// sys_user 表
sysUserDO = new SysUserDO();
String encode = new BCryptPasswordEncoder().encode(convenientMerchantDTO.getPassword());
@@ -2600,7 +2597,7 @@
sysUserDO.setType(10);
sysUserDO.setAreaId(null);
sysUserDO.setStatus(1);
- sysUserDO.setPhone(convenientMerchantDTO.getPhone());
+ sysUserDO.setPhone(null);
sysUserDO.setName(convenientMerchantDTO.getContacts());
sysUserDO.setPassword(encode);
try {
@@ -2677,6 +2674,11 @@
}
}
+ /**
+ * 数据看板升级版
+ *
+ * @return 运营后台数据看板升级版
+ */
@Override
public R dataKanBans(DataKanBansDto dataKanBansDto){
IndexDataKanbanVO indexDataKanbanVO = userDao.selectIndexDataKanban();
@@ -2700,7 +2702,7 @@
});
}
- // 获取最近七天数据
+ // 获取最近二十天数据
List<Date> serverndays = com.panzhihua.common.utlis.DateUtils.getOldDays();
serverndays.forEach(date -> {
// 查询社区活动数量
@@ -2716,4 +2718,27 @@
indexDataKanbanVO.setCommunityUserY(communityUserY);
return R.ok(indexDataKanbanVO);
}
+
+ /**
+ * 运营后台-用户数据统计汇总
+ * @return 用户数据统计汇总
+ */
+ @Override
+ public R communityStatistics(){
+ //返回结果数据
+ IndexUserStatisticsVo userStatisticsVo = new IndexUserStatisticsVo();
+ //查询所有街道
+ List<IndexUserStreetVo> streetList = userDao.getUserStreetList();
+ streetList.forEach(street -> {
+ List<IndexUserCommunityVo> communityList = userDao.getUserCommunityList(street.getStreetId());
+ street.setCommunityList(communityList);
+ });
+ userStatisticsVo.setStreetList(streetList);
+ return R.ok(userStatisticsVo);
+ }
+
+ @Override
+ public R communityStatisticsExport(){
+ return R.ok(userDao.getUserCommunityExcelExport());
+ }
}
--
Gitblit v1.7.1