diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java index 32b893b28b..1bc7389627 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java @@ -2301,40 +2301,4 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res importTaskId, processStatus, operatorId, resultDesc, resultDescPath); } } - - /** - * 灵山需求 - * @param houseId :房屋id - */ - @Async - public void syncHousePartyCenterHouse(String houseId,String resiUserId) { - if(StringUtils.isBlank(houseId)){ - IcResiUserEntity entity=icResiUserDao.selectById(resiUserId); - houseId=entity.getHomeId(); - } - // 查询房屋里的所有人 - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(IcResiUserEntity::getHomeId, houseId) - .eq(IcResiUserEntity::getStatus, NumConstant.ZERO_STR) - .select(IcResiUserEntity::getId); - List resiList = icResiUserDao.selectList(wrapper); - - //默认该房屋不是党员中心户 - ConfigPartyCenterHouseFormDTO configPartyCenterHouseFormDTO=new ConfigPartyCenterHouseFormDTO(); - configPartyCenterHouseFormDTO.setHouseId(houseId); - configPartyCenterHouseFormDTO.setPartyCenterHouseFlag(NumConstant.ZERO_STR); - - if(CollectionUtils.isNotEmpty(resiList)){ - List resiIds = resiList.stream().map(IcResiUserEntity::getId).collect(Collectors.toList()); - // 是否有党员中心户 - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); - queryWrapper.in(IcPartyMemberEntity::getIcResiUser, resiIds) - .eq(IcPartyMemberEntity::getIsDyzxh, NumConstant.ONE_STR); - List dyzxhList = icPartyMemberDao.selectList(queryWrapper); - if (CollectionUtils.isNotEmpty(dyzxhList)) { - configPartyCenterHouseFormDTO.setPartyCenterHouseFlag(NumConstant.ONE_STR); - } - } - govOrgOpenFeignClient.updatePartyCenterHouse(configPartyCenterHouseFormDTO); - } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index 2dd0e033a4..8cc63c2c41 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -87,6 +87,7 @@ import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -220,7 +221,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(IcResiUserEntity::getHomeId, houseId) + .eq(IcResiUserEntity::getStatus, NumConstant.ZERO_STR) + .select(IcResiUserEntity::getId); + List resiList = baseDao.selectList(wrapper); + + //默认该房屋不是党员中心户 + ConfigPartyCenterHouseFormDTO configPartyCenterHouseFormDTO=new ConfigPartyCenterHouseFormDTO(); + configPartyCenterHouseFormDTO.setHouseId(houseId); + configPartyCenterHouseFormDTO.setPartyCenterHouseFlag(NumConstant.ZERO_STR); + + if(CollectionUtils.isNotEmpty(resiList)){ + List resiIds = resiList.stream().map(IcResiUserEntity::getId).collect(Collectors.toList()); + // 是否有党员中心户 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); + queryWrapper.in(IcPartyMemberEntity::getIcResiUser, resiIds) + .eq(IcPartyMemberEntity::getIsDyzxh, NumConstant.ONE_STR); + List dyzxhList = icPartyMemberDao.selectList(queryWrapper); + if (CollectionUtils.isNotEmpty(dyzxhList)) { + configPartyCenterHouseFormDTO.setPartyCenterHouseFlag(NumConstant.ONE_STR); + } + } + govOrgOpenFeignClient.updatePartyCenterHouse(configPartyCenterHouseFormDTO); + } }