|  | @ -343,8 +343,8 @@ public class IcUserTransferRecordServiceImpl extends BaseServiceImpl<IcUserTrans | 
			
		
	
		
		
			
				
					|  |  | 
 |  |  | 
 | 
			
		
	
		
		
			
				
					|  |  |         CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); |  |  |         CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); | 
			
		
	
		
		
			
				
					|  |  |         IcUserChangeRecordEntity changeRecordEntity = new IcUserChangeRecordEntity(); |  |  |         IcUserChangeRecordEntity changeRecordEntity = new IcUserChangeRecordEntity(); | 
			
		
	
		
		
			
				
					
					|  |  |         //5.生成调动记录:  只有迁出的才生成居民调动记录表ic_user_transfer_record记录
 |  |  |         //5.生成调动记录:  只有迁出,或者房屋变更的才生成居民调动记录表ic_user_transfer_record记录
 | 
			
				
				
			
		
	
		
		
			
				
					
					|  |  |         if(IcResiUserConstant.OUT.equals(formDTO.getOrigin())){ |  |  |         if (IcResiUserConstant.OUT.equals(formDTO.getOrigin()) || IcResiUserConstant.CHANGE.equals(formDTO.getOrigin())) { | 
			
				
				
			
		
	
		
		
	
		
		
	
		
		
			
				
					|  |  |             IcUserTransferRecordEntity recordEntity = saveTransferRecord(staffInfoCache, formDTO, resiUserDTO, icResiUserOrgMsgResultDTO, result2.getData()); |  |  |             IcUserTransferRecordEntity recordEntity = saveTransferRecord(staffInfoCache, formDTO, resiUserDTO, icResiUserOrgMsgResultDTO, result2.getData()); | 
			
		
	
		
		
			
				
					|  |  |             insert(recordEntity); |  |  |             insert(recordEntity); | 
			
		
	
		
		
			
				
					|  |  |             changeRecordEntity.setIcUserTransferRecordId(recordEntity.getId()); |  |  |             changeRecordEntity.setIcUserTransferRecordId(recordEntity.getId()); | 
			
		
	
	
		
		
			
				
					|  | @ -371,8 +371,8 @@ public class IcUserTransferRecordServiceImpl extends BaseServiceImpl<IcUserTrans | 
			
		
	
		
		
			
				
					|  |  |             changeRecordEntity.setType("add"); |  |  |             changeRecordEntity.setType("add"); | 
			
		
	
		
		
			
				
					|  |  |             changeRecordEntity.setTypeName("新增"); |  |  |             changeRecordEntity.setTypeName("新增"); | 
			
		
	
		
		
			
				
					|  |  |         } |  |  |         } | 
			
		
	
		
		
			
				
					
					|  |  |         //只有迁出才会赋值变更前,变更后这两句话
 |  |  |         //只有迁出、变动才会赋值变更前,变更后这两句话
 | 
			
				
				
			
		
	
		
		
			
				
					
					|  |  |         if (IcResiUserConstant.OUT.equals(formDTO.getOrigin())) { |  |  |         if (IcResiUserConstant.OUT.equals(formDTO.getOrigin()) || IcResiUserConstant.CHANGE.equals(formDTO.getOrigin())) { | 
			
				
				
			
		
	
		
		
	
		
		
	
		
		
			
				
					|  |  |             StringBuffer beforeName = new StringBuffer(); |  |  |             StringBuffer beforeName = new StringBuffer(); | 
			
		
	
		
		
			
				
					|  |  |             beforeName.append(icResiUserOrgMsgResultDTO.getAgencyDTO().getOrganizationName()).append("-").append(icResiUserOrgMsgResultDTO.getGridDTO().getGridName()).append("-") |  |  |             beforeName.append(icResiUserOrgMsgResultDTO.getAgencyDTO().getOrganizationName()).append("-").append(icResiUserOrgMsgResultDTO.getGridDTO().getGridName()).append("-") | 
			
		
	
		
		
			
				
					|  |  |                     .append(icResiUserOrgMsgResultDTO.getNeighborHoodDTO().getNeighborHoodName()).append("-").append(icResiUserOrgMsgResultDTO.getBuildingDTO().getBuildingName()).append("-") |  |  |                     .append(icResiUserOrgMsgResultDTO.getNeighborHoodDTO().getNeighborHoodName()).append("-").append(icResiUserOrgMsgResultDTO.getBuildingDTO().getBuildingName()).append("-") | 
			
		
	
	
		
		
			
				
					|  | 
 |