| | |
|---|
| | | // if (vo.getIsRent() != null && vo.getIsRent().equals(PopulHouseUseEnum.SELF.getCode())) { |
|---|
| | | // populationDO = updatePopulationDO(vo, populationDO); |
|---|
| | | // } |
|---|
| | | populationDO = updatePopulationDO(vo, populationDO); |
|---|
| | | populationDO = updatePopulationDO(vo, comActDO, populationDO); |
|---|
| | | } |
|---|
| | | |
|---|
| | | //处理实有人口房屋居住信息 |
|---|
| | |
|---|
| | | return R.ok(); |
|---|
| | | } |
|---|
| | | |
|---|
| | | private ComMngPopulationDO updatePopulationDO(ComMngPopulationServeExcelVO vo, ComMngPopulationDO populationDO) throws Exception { |
|---|
| | | private ComMngPopulationDO updatePopulationDO(ComMngPopulationServeExcelVO vo, ComActDO comActDO, ComMngPopulationDO populationDO) throws Exception { |
|---|
| | | UpdateWrapper<ComMngPopulationDO> updateWrapper = new UpdateWrapper<>(); |
|---|
| | | updateWrapper.eq("id",populationDO.getId()); |
|---|
| | | ComMngPopulationDO update = new ComMngPopulationDO(); |
|---|
| | |
|---|
| | | // } |
|---|
| | | String cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey); |
|---|
| | | BeanUtils.copyProperties(vo, update); |
|---|
| | | List<String> userTag = vo.getUserTagStr().stream().map(userTagStr -> userTagStr.split("\\(")[0]).collect(Collectors.toList()); |
|---|
| | | //查询当前社区标签列表 |
|---|
| | | List<String> list = new ArrayList<>(); |
|---|
| | | List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO.selectList(new QueryWrapper<ComMngUserTagDO>().eq("sys_flag", 1).or().eq("community_id", comActDO.getCommunityId())); |
|---|
| | | if (!ObjectUtils.isEmpty(comMngUserTagDOS)) { |
|---|
| | | list = comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName()).collect(Collectors.toList()); |
|---|
| | | } |
|---|
| | | //如果导入数据标签中有当前社区标签列表中不包含的标签，则删除 |
|---|
| | | Iterator<String> iterator = userTag.iterator(); |
|---|
| | | while (iterator.hasNext()) { |
|---|
| | | String s = iterator.next(); |
|---|
| | | if (!list.contains(s)) |
|---|
| | | iterator.remove(); |
|---|
| | | } |
|---|
| | | update.setLabel(Joiner.on(",").join(userTag)); |
|---|
| | | update.setCardNo(cardNoAES); |
|---|
| | | this.baseMapper.update(update,updateWrapper); |
|---|
| | | return populationDO; |
|---|
