|
|
|
@ -37,14 +37,12 @@ import com.elink.esua.epdc.dao.UserDao; |
|
|
|
import com.elink.esua.epdc.dto.UserDTO; |
|
|
|
import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO; |
|
|
|
import com.elink.esua.epdc.dto.epdc.form.EpdcUserRegistFormDTO; |
|
|
|
import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO; |
|
|
|
import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterAuditMsgResultDTO; |
|
|
|
import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO; |
|
|
|
import com.elink.esua.epdc.dto.epdc.result.*; |
|
|
|
import com.elink.esua.epdc.dto.UserGridRelationDTO; |
|
|
|
import com.elink.esua.epdc.dto.epdc.EpdcCompleteAppUserDTO; |
|
|
|
import com.elink.esua.epdc.dto.epdc.EpdcGridLeaderRegisterDTO; |
|
|
|
import com.elink.esua.epdc.dto.epdc.form.*; |
|
|
|
import com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailResultDto; |
|
|
|
import com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailResultDTO; |
|
|
|
import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterInfoResultDTO; |
|
|
|
import com.elink.esua.epdc.entity.PartyAuthenticationFailedEntity; |
|
|
|
import com.elink.esua.epdc.entity.PartyMembersEntity; |
|
|
|
@ -440,6 +438,8 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem |
|
|
|
|
|
|
|
UserEntity oldEntity = this.baseDao.selectById(userDto.getId()); |
|
|
|
|
|
|
|
// 身份证号
|
|
|
|
String identityNo = userDto.getIdentityNo(); |
|
|
|
if (YesOrNoEnum.YES.value().equals(userDto.getPartyFlag())) { |
|
|
|
PartyMembersEntity partyMembersEntity = new PartyMembersEntity(); |
|
|
|
partyMembersEntity.setStreetId(userGridRelation.getStreetId()); |
|
|
|
@ -451,7 +451,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem |
|
|
|
partyMembersEntity.setRegistFlag(YesOrNoEnum.YES.value()); |
|
|
|
|
|
|
|
QueryWrapper<PartyMembersEntity> partyWrapper = new QueryWrapper<>(); |
|
|
|
partyWrapper.eq(UserFieldConsant.IDENTITY_NO, userDto.getIdentityNo()) |
|
|
|
partyWrapper.eq(UserFieldConsant.IDENTITY_NO, identityNo) |
|
|
|
.eq(UserFieldConsant.REAL_NAME, userDto.getRealName()); |
|
|
|
int selectCount = this.partyMembersDao.selectCount(partyWrapper); |
|
|
|
|
|
|
|
@ -460,12 +460,16 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem |
|
|
|
PartyAuthenticationFailedEntity authenticationFailedEntity = ConvertUtils.sourceToTarget(partyMembersEntity, PartyAuthenticationFailedEntity.class); |
|
|
|
authenticationFailedEntity.setState(Integer.parseInt(YesOrNoEnum.NO.value())); |
|
|
|
authenticationFailedEntity.setAddress(userDto.getAddress()); |
|
|
|
authenticationFailedEntity.setRealName(userDto.getRealName()); |
|
|
|
authenticationFailedEntity.setMobile(userDto.getMobile()); |
|
|
|
authenticationFailedEntity.setIdentityNo(identityNo); |
|
|
|
authenticationFailedEntity.setRegistTime(oldEntity.getRegisterTime()); |
|
|
|
partyAuthenticationFailedDao.insert(authenticationFailedEntity); |
|
|
|
|
|
|
|
userDto.setState(AppUserStatesEnum.PARTY_MEMBER_AUTHENTICATION_FAILED.value()); |
|
|
|
}else { |
|
|
|
userDto.setState(AppUserStatesEnum.STATE_INFORMATION_NOT_PASSED.value()); |
|
|
|
} else { |
|
|
|
UpdateWrapper<PartyMembersEntity> partyUpdate = new UpdateWrapper<>(); |
|
|
|
partyUpdate.eq(UserFieldConsant.IDENTITY_NO, userDto.getIdentityNo()) |
|
|
|
partyUpdate.eq(UserFieldConsant.IDENTITY_NO, identityNo) |
|
|
|
.eq(UserFieldConsant.REAL_NAME, userDto.getRealName()); |
|
|
|
|
|
|
|
this.partyMembersDao.update(partyMembersEntity, partyUpdate); |
|
|
|
@ -476,16 +480,15 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem |
|
|
|
userDto.setState(AppUserStatesEnum.STATE_COMPLETED_INFORMATION_PENDING_REVIEW.value()); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
// 昵称前缀
|
|
|
|
String nicknamePrefix = "网格长-"; |
|
|
|
if (!oldEntity.getNickname().startsWith(nicknamePrefix)) { |
|
|
|
nicknamePrefix = userDto.getRoad().concat("-"); |
|
|
|
} |
|
|
|
// 姓
|
|
|
|
String lastName = userDto.getRealName().substring(NumConstant.ZERO, NumConstant.ONE); |
|
|
|
if (oldEntity.getNickname().startsWith(nicknamePrefix)) { |
|
|
|
userDto.setNickname(nicknamePrefix.concat(lastName).concat(UserSexEnum.FEMALE.sex().equals(userDto.getSex()) ? "女士" : "先生")); |
|
|
|
}else { |
|
|
|
userDto.setNickname( |
|
|
|
userDto.getRoad().concat("-").concat(lastName).concat(UserSexEnum.FEMALE.sex().equals(userDto.getSex()) ? "女士" : "先生")); |
|
|
|
} |
|
|
|
|
|
|
|
userDto.setNickname(nicknamePrefix.concat(lastName).concat(UserSexEnum.FEMALE.sex().equals(userDto.getSex()) ? "女士" : "先生")); |
|
|
|
|
|
|
|
UserEntity userEntity = ConvertUtils.sourceToTarget(userDto, UserEntity.class); |
|
|
|
boolean updateUser = this.updateById(userEntity); |
|
|
|
@ -498,15 +501,62 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem |
|
|
|
|
|
|
|
/** |
|
|
|
* 获取居民详情（已认证或待认证（提交信息待审核）的居民用户） |
|
|
|
* |
|
|
|
* @param userId 用户Id |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
@Override |
|
|
|
public Result<EpdcResidentDetailResultDto> residentDetail(String userId) { |
|
|
|
public Result<EpdcResidentDetailResultDTO> residentDetail(String userId) { |
|
|
|
if(StringUtils.isBlank(userId)){ |
|
|
|
return new Result<EpdcResidentDetailResultDto>().error("用户Id不能为空"); |
|
|
|
return new Result<EpdcResidentDetailResultDTO>().error("用户Id不能为空"); |
|
|
|
} |
|
|
|
EpdcResidentDetailResultDto dto = this.baseDao.residentDetailByUserId(userId); |
|
|
|
EpdcResidentDetailResultDTO dto = this.baseDao.residentDetailByUserId(userId); |
|
|
|
return new Result().ok(dto); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 认证用户（用户信息审核） |
|
|
|
* @param formDTO |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
@Override |
|
|
|
public Result authenticateResident(EpdcAppAuthenticateResidentFormDTO formDTO) { |
|
|
|
if(StringUtils.isBlank(formDTO.getAuthenticatedFlag())){ |
|
|
|
formDTO.setAuthenticatedFlag("0"); |
|
|
|
} |
|
|
|
UserDTO userDTO=this.get(formDTO.getUserId()); |
|
|
|
if(null!=userDTO){ |
|
|
|
if("0".equals(formDTO.getAuthenticatedFlag())){//不通过
|
|
|
|
userDTO.setState(AppUserStatesEnum.STATE_INFORMATION_NOT_PASSED.value()); |
|
|
|
}else if("1".equals(formDTO.getAuthenticatedFlag())){//通过
|
|
|
|
userDTO.setState(AppUserStatesEnum.STATE_INFORMATION_PASSED.value()); |
|
|
|
} |
|
|
|
this.update(userDTO); |
|
|
|
} |
|
|
|
return new Result(); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 获取党员详情（已认证或未认证的党员用户） |
|
|
|
* @param userId |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
@Override |
|
|
|
public Result<EpdcPartyMemberDetailDto> partyMemberDetail(String userId) { |
|
|
|
if(StringUtils.isBlank(userId)){ |
|
|
|
return new Result<EpdcPartyMemberDetailDto>().error("用户Id不能为空"); |
|
|
|
} |
|
|
|
String idNo = baseDao.getPartyMemberIdNoByUserID(userId); |
|
|
|
if(StringUtils.isBlank(idNo)){ |
|
|
|
return new Result<EpdcPartyMemberDetailDto>().error("用户不是党员或身份证号为空"); |
|
|
|
} |
|
|
|
EpdcPartyMemberDetailDto dto = baseDao.partyMemberDetailByUserId(userId); |
|
|
|
if(dto == null){ |
|
|
|
dto = baseDao.partyMemberDetailFaild(userId); |
|
|
|
} |
|
|
|
if(dto != null){ |
|
|
|
return new Result().ok(dto); |
|
|
|
} |
|
|
|
return new Result<EpdcPartyMemberDetailDto>().error("获取信息失败"); |
|
|
|
} |
|
|
|
} |
|
|
|
|
王金鹏
7 years ago