|
@ -362,7 +362,6 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl<IcResiCollectDao, |
|
|
for(int i = 0 ; i < memberList.size() ; i++){ |
|
|
for(int i = 0 ; i < memberList.size() ; i++){ |
|
|
// 根据身份证号和房屋ID获取人员信息
|
|
|
// 根据身份证号和房屋ID获取人员信息
|
|
|
IcResiUserEntity userIdCardEntity = queryOriginUserByIdCard(memberList.get(i).getIdNum(),icResiCollectEntity.getCustomerId()); |
|
|
IcResiUserEntity userIdCardEntity = queryOriginUserByIdCard(memberList.get(i).getIdNum(),icResiCollectEntity.getCustomerId()); |
|
|
Map<String, IcResiUserEntity> userMap = queryOriginUserByHomeId(icResiCollectEntity.getHomeId(),icResiCollectEntity.getCustomerId()); |
|
|
|
|
|
if(userIdCardEntity != null){ |
|
|
if(userIdCardEntity != null){ |
|
|
// 已存在人员 人员房屋不一致(更新人员信息和变更记录)
|
|
|
// 已存在人员 人员房屋不一致(更新人员信息和变更记录)
|
|
|
updateUserInfo(icResiCollectEntity,memberList.get(i),true,formDTO,userIdCardEntity); |
|
|
updateUserInfo(icResiCollectEntity,memberList.get(i),true,formDTO,userIdCardEntity); |
|
@ -524,7 +523,7 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl<IcResiCollectDao, |
|
|
userEntity.setYhzgx(icResiCollectMemDetailDTO.getRelationship()); |
|
|
userEntity.setYhzgx(icResiCollectMemDetailDTO.getRelationship()); |
|
|
userEntity.setGzdw(icResiCollectMemDetailDTO.getWorkPlace()); |
|
|
userEntity.setGzdw(icResiCollectMemDetailDTO.getWorkPlace()); |
|
|
userEntity.setRemarks(icResiCollectMemDetailDTO.getRemark()); |
|
|
userEntity.setRemarks(icResiCollectMemDetailDTO.getRemark()); |
|
|
icResiUserDao.updateById(userEntity); |
|
|
icResiUserDao.insert(userEntity); |
|
|
|
|
|
|
|
|
//变更记录表
|
|
|
//变更记录表
|
|
|
IcUserChangeRecordEntity changeRecordEntity = new IcUserChangeRecordEntity(); |
|
|
IcUserChangeRecordEntity changeRecordEntity = new IcUserChangeRecordEntity(); |
|
|