|
@ -1,6 +1,7 @@ |
|
|
package com.epmet.modules.partymember.service.impl; |
|
|
package com.epmet.modules.partymember.service.impl; |
|
|
|
|
|
|
|
|
import com.alibaba.fastjson.JSON; |
|
|
import com.alibaba.fastjson.JSON; |
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
|
|
import com.epmet.commons.tools.constant.AppClientConstant; |
|
|
import com.epmet.commons.tools.constant.AppClientConstant; |
|
|
import com.epmet.commons.tools.constant.EpmetRoleKeyConstant; |
|
|
import com.epmet.commons.tools.constant.EpmetRoleKeyConstant; |
|
|
import com.epmet.commons.tools.constant.NumConstant; |
|
|
import com.epmet.commons.tools.constant.NumConstant; |
|
@ -21,6 +22,7 @@ import com.epmet.feign.EpmetUserOpenFeignClient; |
|
|
import com.epmet.modules.feign.EpmetUserFeignClient; |
|
|
import com.epmet.modules.feign.EpmetUserFeignClient; |
|
|
import com.epmet.modules.feign.GovOrgFeignClient; |
|
|
import com.epmet.modules.feign.GovOrgFeignClient; |
|
|
import com.epmet.modules.feign.ResiGroupFeignClient; |
|
|
import com.epmet.modules.feign.ResiGroupFeignClient; |
|
|
|
|
|
import com.epmet.modules.partymember.dao.IcPartyMemberDao; |
|
|
import com.epmet.modules.partymember.entity.*; |
|
|
import com.epmet.modules.partymember.entity.*; |
|
|
import com.epmet.modules.partymember.redis.PartymemberInfoRedis; |
|
|
import com.epmet.modules.partymember.redis.PartymemberInfoRedis; |
|
|
import com.epmet.modules.partymember.service.*; |
|
|
import com.epmet.modules.partymember.service.*; |
|
@ -86,6 +88,8 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService |
|
|
private PartymemberAuthRecordService partymemberAuthRecordService; |
|
|
private PartymemberAuthRecordService partymemberAuthRecordService; |
|
|
@Autowired |
|
|
@Autowired |
|
|
private EpmetUserOpenFeignClient epmetUserOpenFeignClient; |
|
|
private EpmetUserOpenFeignClient epmetUserOpenFeignClient; |
|
|
|
|
|
@Autowired |
|
|
|
|
|
private IcPartyMemberDao icPartyMemberDao; |
|
|
|
|
|
|
|
|
@Override |
|
|
@Override |
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
@Transactional(rollbackFor = Exception.class) |
|
@ -191,8 +195,8 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
//获取党员基本信息(匹配)
|
|
|
//获取党员基本信息(匹配)
|
|
|
PartymemberConfirmAutoDTO confirmAutoDTO = |
|
|
//PartymemberConfirmAutoDTO confirmAutoDTO = partymemberBaseInfoService.getPartyMemberBaseInfo(partyMemberInfoDTO);
|
|
|
partymemberBaseInfoService.getPartyMemberBaseInfo(partyMemberInfoDTO); |
|
|
PartymemberConfirmAutoDTO confirmAutoDTO = partyAuth(partyMemberInfoDTO); |
|
|
|
|
|
|
|
|
//判断是否已注册居民,如果没有则注册居民
|
|
|
//判断是否已注册居民,如果没有则注册居民
|
|
|
isResiRegister(partyMemberInfoDTO); |
|
|
isResiRegister(partyMemberInfoDTO); |
|
@ -294,6 +298,30 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService |
|
|
return result; |
|
|
return result; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
|
* 居民点党员提交认证校验逻辑调整改查数字平台党员信息库, |
|
|
|
|
|
* 切只按身份证号查询 |
|
|
|
|
|
*/ |
|
|
|
|
|
public PartymemberConfirmAutoDTO partyAuth(PartymemberInfoDTO dto) { |
|
|
|
|
|
PartymemberConfirmAutoDTO resultDTO = new PartymemberConfirmAutoDTO(); |
|
|
|
|
|
if (StringUtils.isBlank(dto.getIdCard())) { |
|
|
|
|
|
resultDTO.setComparisonResults(false); |
|
|
|
|
|
return resultDTO; |
|
|
|
|
|
} |
|
|
|
|
|
LambdaQueryWrapper<IcPartyMemberEntity> tWrapper = new LambdaQueryWrapper<>(); |
|
|
|
|
|
tWrapper.eq(IcPartyMemberEntity::getCustomerId, dto.getCustomerId()); |
|
|
|
|
|
tWrapper.eq(IcPartyMemberEntity::getIdCard, dto.getIdCard()); |
|
|
|
|
|
tWrapper.last("limit 1"); |
|
|
|
|
|
IcPartyMemberEntity entity = icPartyMemberDao.selectOne(tWrapper); |
|
|
|
|
|
if (null == entity) { |
|
|
|
|
|
resultDTO.setComparisonResults(false); |
|
|
|
|
|
return resultDTO; |
|
|
|
|
|
} |
|
|
|
|
|
resultDTO.setComparisonResults(true); |
|
|
|
|
|
resultDTO.setPatryMemberBaseInfoId(entity.getId()); |
|
|
|
|
|
return resultDTO; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
@Override |
|
|
@Override |
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
public Result partyMemberInfoExtra(PartymemberInfoDTO infoDTO) { |
|
|
public Result partyMemberInfoExtra(PartymemberInfoDTO infoDTO) { |
|
|