From 44b2dd9e11e1751a3189bdc86d6be2cd7560c3b8 Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期三, 13 十月 2021 11:03:43 +0800
Subject: [PATCH] [修改]修改老年认证eldersAuth和UserInput表中全部是大写的字段全部改为小写字母
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 41 ++++++++++++-----------------------------
1 files changed, 12 insertions(+), 29 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 7fcbbc4..41c2119 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
@@ -14,6 +14,9 @@
import javax.annotation.Resource;
+import cn.hutool.core.util.IdcardUtil;
+import com.panzhihua.service_user.dao.*;
+import com.panzhihua.service_user.model.dos.*;
import org.apache.commons.lang.time.DateFormatUtils;
import org.apache.commons.lang.time.DateUtils;
import org.springframework.beans.BeanUtils;
@@ -81,34 +84,6 @@
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.common.utlis.WxUtil;
import com.panzhihua.common.utlis.WxXCXTempSend;
-import com.panzhihua.service_user.dao.ComMngFamilyInfoDAO;
-import com.panzhihua.service_user.dao.ComMngUserTagDAO;
-import com.panzhihua.service_user.dao.EventGridMemberBuildingRelationMapper;
-import com.panzhihua.service_user.dao.LcCompareMemberCodeMapper;
-import com.panzhihua.service_user.dao.RoleDAO;
-import com.panzhihua.service_user.dao.SysMenuDAO;
-import com.panzhihua.service_user.dao.SysOperLogDAO;
-import com.panzhihua.service_user.dao.SysRoleMenuDAO;
-import com.panzhihua.service_user.dao.SysUserAgreementDAO;
-import com.panzhihua.service_user.dao.SysUserFeedbackDAO;
-import com.panzhihua.service_user.dao.SysUserInputDAO;
-import com.panzhihua.service_user.dao.SysUserNoticeDAO;
-import com.panzhihua.service_user.dao.SysUserRoleDAO;
-import com.panzhihua.service_user.dao.UserDao;
-import com.panzhihua.service_user.model.dos.ComMngFamilyInfoDO;
-import com.panzhihua.service_user.model.dos.ComMngUserTagDO;
-import com.panzhihua.service_user.model.dos.EventGridMemberBuildingRelationDO;
-import com.panzhihua.service_user.model.dos.LcCompareCodeMemberDO;
-import com.panzhihua.service_user.model.dos.SysMenuDO;
-import com.panzhihua.service_user.model.dos.SysOperLogDO;
-import com.panzhihua.service_user.model.dos.SysRoleDO;
-import com.panzhihua.service_user.model.dos.SysRoleMenuDO;
-import com.panzhihua.service_user.model.dos.SysUserAgreementDO;
-import com.panzhihua.service_user.model.dos.SysUserDO;
-import com.panzhihua.service_user.model.dos.SysUserFeedbackDO;
-import com.panzhihua.service_user.model.dos.SysUserInputDO;
-import com.panzhihua.service_user.model.dos.SysUserNoticeDO;
-import com.panzhihua.service_user.model.dos.SysUserRoleDO;
import com.panzhihua.service_user.model.dtos.DataKanbanDTO;
import com.panzhihua.service_user.service.EventGridMemberBuildingRelationService;
import com.panzhihua.service_user.service.UserService;
@@ -158,6 +133,8 @@
private EventGridMemberBuildingRelationMapper eventGridMemberBuildingRelationMapper;
@Resource
private LcCompareMemberCodeMapper lcCompareMemberCodeMapper;
+ @Resource
+ private ComActFourMemberDao comActFourMemberDao;
// @Resource
// private GridService gridService;
@@ -346,6 +323,7 @@
loginUserInfoVO.setRoles(set);
}
loginUserInfoVO.setIsmemberrole(2);
+ loginUserInfoVO.setIsFourMember(2);
// 志愿者状态
String phone = sysUserDO.getPhone();
Long userCommunityId = sysUserDO.getCommunityId();
@@ -362,6 +340,11 @@
} else {
int state = comMngVolunteerMngVO.getState().intValue();
loginUserInfoVO.setVolunteerStatus(state);
+ }
+ //是否四长四员
+ Integer countFourMember=comActFourMemberDao.selectCount(new QueryWrapper<ComActFourMember>().lambda().eq(ComActFourMember::getIdCard,sysUserDO.getIdCard()));
+ if(countFourMember>0){
+ loginUserInfoVO.setIsFourMember(1);
}
// 是否是"管理员"或者 本社区 "社区团队"、"党委成员"
Integer countTeam = userDao.selectCountTeam(phone, userCommunityId);
@@ -799,7 +782,7 @@
sysUserDO.setIdCard(idCard);
// 通过身份证号判断性别以及出生日期
sysUserDO.setSex(IdCard.sex(idCard));
- sysUserDO.setBirthday(IdCard.birthDay(idCard));
+ sysUserDO.setBirthday(IdcardUtil.getBirthDate(idCard));
if (!StringUtils.isEmpty(loginUserInfoVO.getJob())) {
sysUserDO.setJob(loginUserInfoVO.getJob());
}
--
Gitblit v1.7.1