huanghongfa
2021-07-02 ffcd3e31c9938eb256d616c80edbe1821e9fb2bf
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/SysUserInputServiceImpl.java
@@ -23,6 +23,7 @@
import com.panzhihua.common.model.vos.user.InputUserInfoVO;
import com.panzhihua.common.utlis.IdCard;
import com.panzhihua.common.utlis.SensitiveUtil;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_user.dao.ComMngUserTagDAO;
import com.panzhihua.service_user.dao.SysUserInputDAO;
import com.panzhihua.service_user.model.dos.ComMngFamilyInfoDO;
@@ -90,12 +91,13 @@
                if(count==0){
                    SysUserInputDO sysUserInputDO=new SysUserInputDO();
                    String doorNumber = eexcelUserDTO.getDoorNumber();
                    List<ComMngStructHouseVO> collect = comMngStructHouseVOS1.stream().filter(comMngStructHouseVO -> comMngStructHouseVO.getHouseName().equals(doorNumber)).collect(Collectors.toList());
                    if (ObjectUtils.isEmpty(collect)) {
                        throw new ServiceException("门牌号后台不存在或格式错误,错误门牌号为"+doorNumber);
                    }else{
                        sysUserInputDO.setHouseCode(collect.get(0).getHouseCode());
                    }
                    //暂时注释门牌号匹配设置房屋编号功能
//                    List<ComMngStructHouseVO> collect = comMngStructHouseVOS1.stream().filter(comMngStructHouseVO -> comMngStructHouseVO.getHouseName().equals(doorNumber)).collect(Collectors.toList());
//                    if (ObjectUtils.isEmpty(collect)) {
//                        throw new ServiceException("门牌号后台不存在或格式错误,错误门牌号为"+doorNumber);
//                    }else{
//                        sysUserInputDO.setHouseCode(collect.get(0).getHouseCode());
//                    }
                    sysUserInputDO.setAreaId(comMngStructAreaVO.getId());
                    sysUserInputDO.setCommunityId(comMngStructAreaVO.getCommunityId());
                    sysUserInputDO.setCompany(eexcelUserDTO.getCompany());
@@ -213,6 +215,9 @@
        iPage.getRecords().forEach(record->{
            record.setPhone(SensitiveUtil.desensitizedPhoneNumber(record.getPhone()));
            record.setIdCard(SensitiveUtil.desensitizedIdNumber(record.getIdCard()));
            if(!StringUtils.isEmpty(record.getTags()) && record.getTags().endsWith(",")){
                record.setTags(record.getTags().substring(0,record.getTags().length()-1));
            }
        });
        return R.ok(iPage);
    }
@@ -222,10 +227,15 @@
        SysUserInputDO userInputDO=new SysUserInputDO();
        userInputDO.setId(inputUserTagsDTO.getId());
        userInputDO.setTags(inputUserTagsDTO.getTags());
        List<SysUserInputDO> all = sysUserInputDAO.selectList(new QueryWrapper<SysUserInputDO>().lambda().eq(SysUserInputDO::getIdCard,userInputDO.getIdCard()));
        List<SysUserInputDO> all = sysUserInputDAO.selectList(new QueryWrapper<SysUserInputDO>().lambda().eq(SysUserInputDO::getId,userInputDO.getId()));
        all.forEach(d->{
            d.setTags(inputUserTagsDTO.getTags());
            if(!StringUtils.isEmpty(d.getTags())){
                d.setTags(d.getTags()+","+inputUserTagsDTO.getTags());
            }else{
                d.setTags(inputUserTagsDTO.getTags());
            }
            sysUserInputDAO.updateById(userInputDO);
        });
        return R.ok();
    }