Merge remote-tracking branch 'origin/dev_party_mange' into dev_party_mange

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyselfMsgResultDTO.java

@@ -48,8 +48,4 @@ public class MyselfMsgResultDTO implements Serializable {
      */
     private  String volunteerFlag;
 
-    /**
-     * 类别【字典表】
-     */
-    private String volunteerCategory;
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java

@@ -171,7 +171,6 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
                 }*/
 
 
-
         baseInfo.setUserId(wxUserInfoFormDTO.getUserId());
         baseInfo.setNickname(wxUserInfoFormDTO.getNickName());
         baseInfo.setHeadImgUrl(wxUserInfoFormDTO.getAvatarUrl());
@@ -181,7 +180,6 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
     }
 
     /**
-     *
      * @Description 查询用户注册时间
      * @param: formDTO
      * @Author zxc
@@ -195,30 +193,37 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
     }
 
     /**
-     * @Description 居民端获取个人信息
      * @param myResiUserInfoFormDTO
      * @return MyResiUserInfoResultDTO
+     * @Description 居民端获取个人信息
      * @author wangc
      * @date 2020.05.22 19:24
      **/
     @Override
     public MyResiUserInfoResultDTO resiMyselfMsg(MyResiUserInfoFormDTO myResiUserInfoFormDTO) {
         MyselfMsgResultDTO myselfMsg = baseDao.getMyselfMsg(myResiUserInfoFormDTO.getUserId());
-        if(null != myselfMsg){
+        Result<VolunteerInfoDTO> volun = epmetHeartOpenFeignClient.queryUserVolunteerInfo(myResiUserInfoFormDTO.getUserId());
-            MyResiUserInfoResultDTO result = ConvertUtils.sourceToTarget(myselfMsg,MyResiUserInfoResultDTO.class);
+        if (volun.success() && null != volun.getData()) {
+            myselfMsg.setVolunteerFlag("1");//志愿者
+        } else {
+            myselfMsg.setVolunteerFlag("0");
+        }
+
+        if (null != myselfMsg) {
+            MyResiUserInfoResultDTO result = ConvertUtils.sourceToTarget(myselfMsg, MyResiUserInfoResultDTO.class);
             //registerFlag 是否已注册居民，true ,false
             result.setRegisterFlag(StringUtils.isNotBlank(myselfMsg.getResiId()));
             // 已录入身份证号：true;未完善：false.
             result.setCompleteIdNum(StringUtils.isNotBlank(myselfMsg.getIdNum()));
             result.setRegisterGridName(ModuleConstant.EMPTY_STR);
-            if(StringUtils.isNotBlank(myselfMsg.getGridId())){
+            if (StringUtils.isNotBlank(myselfMsg.getGridId())) {
                 //registerGridName 当前在哪个网格，显示哪个网格的名称
                 CustomerGridFormDTO gridId = new CustomerGridFormDTO();
                 gridId.setGridId(myResiUserInfoFormDTO.getGridId());
                 Result<CustomerGridDTO> gridResult = govOrgFeignClient.getCustomerGridByGridId(gridId);
-                if(gridResult.success() && null != gridResult.getData() && null != gridResult.getData().getGridName()){
+                if (gridResult.success() && null != gridResult.getData() && null != gridResult.getData().getGridName()) {
                     result.setRegisterGridName(gridResult.getData().getGridName());
-                }else {
+                } else {
                     if (StringUtils.isNotBlank(gridResult.getMsg())) {
                         log.warn(gridResult.getMsg());
                     }
@@ -235,7 +240,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
             CommonUserFormDTO pointParam = new CommonUserFormDTO();
             pointParam.setCustomerId(myResiUserInfoFormDTO.getCustomerId());
             Result<ResiPointDetailResultDTO> pointResult = epmetPointOpenFeignClient.myPoint(pointParam);
-            if(pointResult.success() && null != pointResult.getData()){
+            if (pointResult.success() && null != pointResult.getData()) {
                 //累计积分
                 result.setPoint(pointResult.getData().getUsablePoint());
                 //今日已获得积分，用于积分任务列表显示
@@ -323,7 +328,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
     public UserDTO saveUserInfo(UserInfoFormDTO formDTO) {
         UserDTO result = new UserDTO();
         UserDTO userDTO = userWechatDao.selectUserDTOByUid(formDTO.getUid(), formDTO.getApp());
-        if (null == userDTO){
+        if (null == userDTO) {
             // 用户不存在
             //user表新增
             UserEntity userEntity = new UserEntity();
@@ -346,7 +351,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
                 throw new RenException(UserConstant.SAVE_USER_WECHAT);
             }
             result.setId(userEntity.getId());
-        }else {
+        } else {
             // 用户已存在
             formDTO.setUserId(userDTO.getId());
             if (userWechatDao.editByUserId(formDTO) < NumConstant.ONE) {
@@ -392,11 +397,11 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         }
         ResiUserResDTO resiUserResDTO = ConvertUtils.sourceToTarget(formDTO, ResiUserResDTO.class);
         if (StringUtils.isNotBlank(formDTO.getIdNum())) {
-            List<UserBaseInfoDTO> userBaseInfoList = userBaseInfoService.getCommonIdNumUser(formDTO.getCustomerId(),formDTO.getIdNum());
+            List<UserBaseInfoDTO> userBaseInfoList = userBaseInfoService.getCommonIdNumUser(formDTO.getCustomerId(), formDTO.getIdNum());
             if (CollectionUtils.isEmpty(userBaseInfoList)) {
                 log.info("user_base_info没有找到,去查下user_resi_info表吧");
-                List<UserResiInfoDTO> userResiInfoDTO = userResiInfoDao.selectCommonIdNumUser(formDTO.getCustomerId(),formDTO.getIdNum());
+                List<UserResiInfoDTO> userResiInfoDTO = userResiInfoDao.selectCommonIdNumUser(formDTO.getCustomerId(), formDTO.getIdNum());
-                resiUserResDTO.setEpmetUserIdList(CollectionUtils.isNotEmpty(userResiInfoDTO) ? userResiInfoDTO.stream().map(UserResiInfoDTO::getUserId).collect(Collectors.toList()): new ArrayList<>());
+                resiUserResDTO.setEpmetUserIdList(CollectionUtils.isNotEmpty(userResiInfoDTO) ? userResiInfoDTO.stream().map(UserResiInfoDTO::getUserId).collect(Collectors.toList()) : new ArrayList<>());
             } else {
                 resiUserResDTO.setEpmetUserIdList(userBaseInfoList.stream().map(UserBaseInfoDTO::getUserId).collect(Collectors.toList()));
             }
@@ -412,20 +417,20 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
      */
     @Override
     public EpmetUserFamilyDTO findIcUser(FindIcUserFormDTO findIcUserFormDTO) {
-        EpmetUserFamilyDTO result=new EpmetUserFamilyDTO();
+        EpmetUserFamilyDTO result = new EpmetUserFamilyDTO();
-        String idNum=baseDao.selectIdNum(findIcUserFormDTO.getCustomerId(),findIcUserFormDTO.getEpmetUserId());
+        String idNum = baseDao.selectIdNum(findIcUserFormDTO.getCustomerId(), findIcUserFormDTO.getEpmetUserId());
-        if(StringUtils.isNotBlank(idNum)){
+        if (StringUtils.isNotBlank(idNum)) {
             //同客户下，相同身份证号的，epmetuser
-            List<String> epmetUserIdList=baseDao.selectCommonEpmetUser(idNum,findIcUserFormDTO.getCustomerId());
+            List<String> epmetUserIdList = baseDao.selectCommonEpmetUser(idNum, findIcUserFormDTO.getCustomerId());
             result.setEpmetUserIdList(epmetUserIdList);
             //找到该身份证号的居民
-            IcResiUserDTO icResiUserDTO=icResiUserService.getByIdCard(findIcUserFormDTO.getCustomerId(),idNum,null);
+            IcResiUserDTO icResiUserDTO = icResiUserService.getByIdCard(findIcUserFormDTO.getCustomerId(), idNum, null);
-            if(null!=icResiUserDTO){
+            if (null != icResiUserDTO) {
                 result.setIcResiUserId(icResiUserDTO.getId());
                 result.setIcUserName(icResiUserDTO.getName());
                 result.setHouseId(icResiUserDTO.getHomeId());
-                IcResiUserBriefDTO icResiUserBriefDTO=icResiUserService.findFamilyMem(icResiUserDTO.getId());
+                IcResiUserBriefDTO icResiUserBriefDTO = icResiUserService.findFamilyMem(icResiUserDTO.getId());
-                result.setHouseUserList(null!=icResiUserBriefDTO&&CollectionUtils.isNotEmpty(icResiUserBriefDTO.getHouseUserList())?icResiUserBriefDTO.getHouseUserList():new ArrayList<>());
+                result.setHouseUserList(null != icResiUserBriefDTO && CollectionUtils.isNotEmpty(icResiUserBriefDTO.getHouseUserList()) ? icResiUserBriefDTO.getHouseUserList() : new ArrayList<>());
             }
         }
         result.setEpmetUserIdList(Arrays.asList(findIcUserFormDTO.getEpmetUserId()));
@@ -440,27 +445,27 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void modifyRegGrid(ModifyRegGridFormDTO formDTO) {
-        GridInfoCache newGridInfo= CustomerOrgRedis.getGridInfo(formDTO.getGridId());
+        GridInfoCache newGridInfo = CustomerOrgRedis.getGridInfo(formDTO.getGridId());
-        RegisterRelationEntity originReg=registerRelationDao.selectRegisteredGridIdByUserIdAndCustomerId(formDTO.getUserId(),formDTO.getCustomerId());
+        RegisterRelationEntity originReg = registerRelationDao.selectRegisteredGridIdByUserIdAndCustomerId(formDTO.getUserId(), formDTO.getCustomerId());
         if (null == newGridInfo || null == originReg) {
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "居民端_修改注册网格:查询网格信息异常", "服务器开小差了...");
         }
         //修改register_relation表
-        LambdaQueryWrapper<RegisterRelationEntity> originWrapper=new LambdaQueryWrapper();
+        LambdaQueryWrapper<RegisterRelationEntity> originWrapper = new LambdaQueryWrapper();
-        originWrapper.eq(RegisterRelationEntity::getCustomerId,formDTO.getCustomerId())
+        originWrapper.eq(RegisterRelationEntity::getCustomerId, formDTO.getCustomerId())
-                .eq(RegisterRelationEntity::getUserId,formDTO.getUserId())
+                .eq(RegisterRelationEntity::getUserId, formDTO.getUserId())
                 .eq(RegisterRelationEntity::getFirstRegister, NumConstant.ONE_STR);
         //1、删除废弃网格的(现在生产存在同一个用户相同的网格id多条记录，所以用delete方法)
         registerRelationDao.delete(originWrapper);
 
         //2、删除用户与当前选择的网格的关系，新插入一条注册关系，
-        LambdaQueryWrapper<RegisterRelationEntity> deleteWrapper=new LambdaQueryWrapper();
+        LambdaQueryWrapper<RegisterRelationEntity> deleteWrapper = new LambdaQueryWrapper();
-        deleteWrapper.eq(RegisterRelationEntity::getCustomerId,formDTO.getCustomerId())
+        deleteWrapper.eq(RegisterRelationEntity::getCustomerId, formDTO.getCustomerId())
-                .eq(RegisterRelationEntity::getUserId,formDTO.getUserId())
+                .eq(RegisterRelationEntity::getUserId, formDTO.getUserId())
                 .eq(RegisterRelationEntity::getGridId, formDTO.getGridId());
         registerRelationDao.delete(deleteWrapper);
 
-        RegisterRelationEntity insert=new RegisterRelationEntity();
+        RegisterRelationEntity insert = new RegisterRelationEntity();
         insert.setCustomerId(formDTO.getCustomerId());
         insert.setGridId(formDTO.getGridId());
         insert.setUserId(formDTO.getUserId());
@@ -470,29 +475,30 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         registerRelationDao.insert(insert);
 
         //2、修改历史徽章表
-        LambdaUpdateWrapper<UserBadgeCertificateRecordEntity> recUpdate=new LambdaUpdateWrapper<>();
+        LambdaUpdateWrapper<UserBadgeCertificateRecordEntity> recUpdate = new LambdaUpdateWrapper<>();
-        recUpdate.set(UserBadgeCertificateRecordEntity::getGridId,newGridInfo.getId())
+        recUpdate.set(UserBadgeCertificateRecordEntity::getGridId, newGridInfo.getId())
-                .set(UserBadgeCertificateRecordEntity::getUpdatedBy,formDTO.getUserId())
+                .set(UserBadgeCertificateRecordEntity::getUpdatedBy, formDTO.getUserId())
-                .set(UserBadgeCertificateRecordEntity::getUpdatedTime,new Date());
+                .set(UserBadgeCertificateRecordEntity::getUpdatedTime, new Date());
-        recUpdate.eq(UserBadgeCertificateRecordEntity::getCustomerId,formDTO.getCustomerId())
+        recUpdate.eq(UserBadgeCertificateRecordEntity::getCustomerId, formDTO.getCustomerId())
-                 .eq(UserBadgeCertificateRecordEntity::getUserId,formDTO.getUserId());
+                .eq(UserBadgeCertificateRecordEntity::getUserId, formDTO.getUserId());
-        userBadgeCertificateRecordDao.update(null,recUpdate);
+        userBadgeCertificateRecordDao.update(null, recUpdate);
-
+
-        LambdaUpdateWrapper<ResiUserBadgeEntity> badgeUpdate=new LambdaUpdateWrapper<>();
+        LambdaUpdateWrapper<ResiUserBadgeEntity> badgeUpdate = new LambdaUpdateWrapper<>();
-        badgeUpdate.set(ResiUserBadgeEntity::getGridId,newGridInfo.getId())
+        badgeUpdate.set(ResiUserBadgeEntity::getGridId, newGridInfo.getId())
-                .set(ResiUserBadgeEntity::getUpdatedBy,formDTO.getUserId())
+                .set(ResiUserBadgeEntity::getUpdatedBy, formDTO.getUserId())
-                .set(ResiUserBadgeEntity::getUpdatedTime,new Date());;
+                .set(ResiUserBadgeEntity::getUpdatedTime, new Date());
-        badgeUpdate.eq(ResiUserBadgeEntity::getCustomerId,formDTO.getCustomerId())
+        ;
-                .eq(ResiUserBadgeEntity::getUserId,formDTO.getUserId());
+        badgeUpdate.eq(ResiUserBadgeEntity::getCustomerId, formDTO.getCustomerId())
-        resiUserBadgeDao.update(null,badgeUpdate);
+                .eq(ResiUserBadgeEntity::getUserId, formDTO.getUserId());
+        resiUserBadgeDao.update(null, badgeUpdate);
 
         //3、修改支援者信息表
-        modifyVolunteerGrid(formDTO,newGridInfo);
+        modifyVolunteerGrid(formDTO, newGridInfo);
 
         //4、删除用户缓存信息
         userBaseInfoRedis.clearUserCache(Arrays.asList(formDTO.getUserId()));
         //5、插入用户注册网格变更记录
-        UserRegGridChangeRecEntity log=new UserRegGridChangeRecEntity();
+        UserRegGridChangeRecEntity log = new UserRegGridChangeRecEntity();
         log.setCustomerId(formDTO.getCustomerId());
         log.setUserId(formDTO.getUserId());
         log.setOriginGridId(originReg.getGridId());
@@ -501,14 +507,14 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
     }
 
     private void modifyVolunteerGrid(ModifyRegGridFormDTO formDTO, GridInfoCache newGridInfo) {
-        VolunteerInfoDTO volunteerInfoDTO=new VolunteerInfoDTO();
+        VolunteerInfoDTO volunteerInfoDTO = new VolunteerInfoDTO();
         volunteerInfoDTO.setCustomerId(formDTO.getCustomerId());
         volunteerInfoDTO.setUserId(formDTO.getUserId());
         volunteerInfoDTO.setGridId(newGridInfo.getId());
         volunteerInfoDTO.setPid(newGridInfo.getPid());
         volunteerInfoDTO.setPids(newGridInfo.getPids());
         volunteerInfoDTO.setGridName(newGridInfo.getGridName());
-        Result volunteerRes=epmetHeartOpenFeignClient.modifyVolunteerGrid(volunteerInfoDTO);
+        Result volunteerRes = epmetHeartOpenFeignClient.modifyVolunteerGrid(volunteerInfoDTO);
         if (!volunteerRes.success()) {
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "居民端_修改注册网格:修改用户志愿者信息异常", "服务器开小差了...");
         }

epmet-user/epmet-user-server/src/main/resources/mapper/UserDao.xml

@@ -35,9 +35,7 @@
             IFNULL(resi.ID,"") AS resiId,
             IFNULL(CONCAT(resi.SURNAME,resi.NAME),"") AS userRealName,
             IFNULL(relation.GRID_ID,"") AS gridId,
-            IFNULL(resi.id_num,'')AS idNum,
+            IFNULL(resi.id_num,'')AS idNum
-            IF(iv.id is null,'0','1') as volunteerFlag,
-            iv.VOLUNTEER_CATEGORY
             FROM
             USER user
             LEFT JOIN
@@ -48,8 +46,6 @@
             REGISTER_RELATION relation ON user.ID = relation.USER_ID
             AND relation.DEL_FLAG = '0'
             AND relation.FIRST_REGISTER = '1'
-            LEFT JOIN ic_resi_user ru on ru.ID_CARD=wechat.ID_NUM and ru.DEL_FLAG=0
-			LEFT JOIN ic_volunteer iv ON iv.IC_RESI_USER=ru.id and iv.DEL_FLAG=0
             WHERE
             user.ID = #{userId}
             AND