From 6c3dcdcb89e181aac47e60a001dbe9e8921c8e79 Mon Sep 17 00:00:00 2001
From: 罗yu 元桥 <2376770955@qq.com>
Date: 星期三, 28 四月 2021 14:09:32 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 48 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 39 insertions(+), 9 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 059325f..45a1387 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
@@ -230,6 +230,7 @@
loginUserInfoVO.setIsmemberrole(2);
// 志愿者状态
String phone = sysUserDO.getPhone();
+ Long userCommunityId = sysUserDO.getCommunityId();
if (!ObjectUtils.isEmpty(phone)) {
ComMngVolunteerMngVO comMngVolunteerMngVO = userDao.selectVolunteerMngByPhone(phone);
if (ObjectUtils.isEmpty(comMngVolunteerMngVO)) {
@@ -238,8 +239,9 @@
int state = comMngVolunteerMngVO.getState().intValue();
loginUserInfoVO.setVolunteerStatus(state);
}
- Integer countTeam = userDao.selectCountTeam(phone);
- Integer selectCountMemberRole = userDao.selectCountMemberRole(phone);
+ //是否是"管理员"或者 本社区 "社区团队"、"党委成员"
+ Integer countTeam = userDao.selectCountTeam(phone, userCommunityId);
+ Integer selectCountMemberRole = userDao.selectCountMemberRole(phone, userCommunityId);
Integer isSysUser = userDao.selectCountSysUser(phone);
if (countTeam != null && countTeam > 0) {
loginUserInfoVO.setIsmemberrole(1);
@@ -415,7 +417,7 @@
/**
* 人员详情
- *
+ *detailuser
* @param userId 用户id
* @return 人员详情
*/
@@ -532,12 +534,12 @@
sysUserDO.setUserId(userId);
SysUserDO userInDB = userDao.selectById(userId);
- if(userInDB!=null) {
- boolean isVol = userInDB.getIsVolunteer()==1;
- if(isVol){
+ if (userInDB != null) {
+ boolean isVol = userInDB.getIsVolunteer() == 1;
+ if (isVol) {
return R.fail("用户已是志愿者");
}
- if(userInDB.getType()!=1){
+ if (userInDB.getType() != 1) {
return R.fail("用户不是小程序用户");
}
int update = userDao.updateById(sysUserDO);
@@ -547,6 +549,7 @@
}
return R.fail();
}
+
/**
* 用户绑定社区、小区
*
@@ -736,6 +739,7 @@
if (!ObjectUtils.isEmpty(comMngFamilyInfoDO1)) {
return R.fail("家庭成员已经存在");
}
+ comMngFamilyInfoDO.setAge(IdCard.IdNOToAge(comMngFamilyInfoVO.getIdCard()));
int insert = comMngFamilyInfoDAO.insert(comMngFamilyInfoDO);
if (insert > 0) {
return R.ok();
@@ -753,6 +757,7 @@
public R putFamily(ComMngFamilyInfoVO comMngFamilyInfoVO) {
ComMngFamilyInfoDO comMngFamilyInfoDO = new ComMngFamilyInfoDO();
BeanUtils.copyProperties(comMngFamilyInfoVO, comMngFamilyInfoDO);
+ comMngFamilyInfoDO.setAge(IdCard.IdNOToAge(comMngFamilyInfoVO.getIdCard()));
int update = comMngFamilyInfoDAO.updateById(comMngFamilyInfoDO);
if (update > 0) {
return R.ok();
@@ -1498,10 +1503,13 @@
String idCard = sysUserDO.getIdCard();
if (!ObjectUtils.isEmpty(idCard)) {
communityUserInfoVO.setAge(IdCard.IdNOToAge(idCard));
- communityUserInfoVO.setBirthday(IdCard.birthDay(idCard));
+ communityUserInfoVO.setBirthday(sysUserDO.getBirthday());
communityUserInfoVO.setIdCard(idCard);
}
communityUserInfoVO.setCreateAt(sysUserDO.getCreateAt());
+ communityUserInfoVO.setCardPhotoBack(sysUserDO.getCardPhotoBack());
+ communityUserInfoVO.setCardPhotoFront(sysUserDO.getCardPhotoFront());
+ communityUserInfoVO.setFamilyBook(sysUserDO.getFamilyBook());
communityUserInfoVO.setName(sysUserDO.getName());
String phone = sysUserDO.getPhone();
communityUserInfoVO.setPhone(phone);
@@ -1657,7 +1665,7 @@
return R.fail("账户已经存在");
}
}
- return R.fail();
+ return R.ok();
}
/**
@@ -1702,4 +1710,26 @@
return R.fail();
}
}
+
+ @Override
+ public R getUserArchives(Long userId) {
+ //查询用户信息
+ SysUserDO userDO = userDao.selectById(userId);
+ if (userDO == null) {
+ return R.fail("未查询到用户信息");
+ }
+ UserArchivesVO userArchivesVO = new UserArchivesVO();
+ BeanUtils.copyProperties(userDO, userArchivesVO);
+ userArchivesVO.setUserId(userDO.getUserId());
+ return R.ok(userArchivesVO);
+ }
+
+ @Override
+ public R updateUserArchives(UpdateUserArchivesVO userArchivesVO) {
+ if(userArchivesVO.getUserId()==null){
+ return R.fail("未查询到用户信息");
+ }
+ userDao.updateUserArchives(userArchivesVO);
+ return R.ok();
+ }
}
--
Gitblit v1.7.1