| 
						
						
							
								
							
						
						
					 | 
					@ -115,11 +115,11 @@ public class IcResiComparisonRecordServiceImpl extends BaseServiceImpl<IcResiCom | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                resultDTO.setResultExplain("公安部接口调用失败"); | 
					 | 
					 | 
					                resultDTO.setResultExplain("公安部接口调用失败"); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                return resultDTO; | 
					 | 
					 | 
					                return resultDTO; | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					            } else { | 
					 | 
					 | 
					            } else { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                //数据已处理
 | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                recordEntity.setType("1"); | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                //公安部不存在的数据
 | 
					 | 
					 | 
					                //公安部不存在的数据
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                if (CollectionUtils.isEmpty(sfhyxxcxdsjjResult.getData().getResult())) { | 
					 | 
					 | 
					                if (CollectionUtils.isEmpty(sfhyxxcxdsjjResult.getData().getResult())) { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                    recordEntity.setComparisonResult("公安部身份证号对应数据不存在"); | 
					 | 
					 | 
					                    recordEntity.setComparisonResult("公安部身份证号对应数据不存在"); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					                    //数据不一致的赋值为未处理信息不一致(空)
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					                    recordEntity.setType("0"); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                    //代表程序干活了
 | 
					 | 
					 | 
					                    //代表程序干活了
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                    recordEntity.setIdentical("2"); | 
					 | 
					 | 
					                    recordEntity.setIdentical("2"); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                    resultDTO.setResult(true); | 
					 | 
					 | 
					                    resultDTO.setResult(true); | 
				
			
			
		
	
	
		
		
			
				
					| 
						
						
						
							
								
							
						
					 | 
					@ -129,11 +129,14 @@ public class IcResiComparisonRecordServiceImpl extends BaseServiceImpl<IcResiCom | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                    recordEntity.setPoliceIdCard(sfhyxxcxdsjjResult.getData().getResult().get(0).getGMSFHM()); | 
					 | 
					 | 
					                    recordEntity.setPoliceIdCard(sfhyxxcxdsjjResult.getData().getResult().get(0).getGMSFHM()); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                    //公安部跟居民库姓名不一致
 | 
					 | 
					 | 
					                    //公安部跟居民库姓名不一致
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                    if (!entity.getName().equals(sfhyxxcxdsjjResult.getData().getResult().get(0).getXM())) { | 
					 | 
					 | 
					                    if (!entity.getName().equals(sfhyxxcxdsjjResult.getData().getResult().get(0).getXM())) { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					                        //姓名不一致的赋值为未处理信息不一致(否)
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					                        recordEntity.setType("0"); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                        recordEntity.setIdentical("0"); | 
					 | 
					 | 
					                        recordEntity.setIdentical("0"); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                        recordEntity.setComparisonResult("公安部与居民库姓名不相同"); | 
					 | 
					 | 
					                        recordEntity.setComparisonResult("公安部与居民库姓名不相同"); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                        resultDTO.setResult(true); | 
					 | 
					 | 
					                        resultDTO.setResult(true); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                        resultDTO.setResultExplain("公安部与居民库姓名不相同"); | 
					 | 
					 | 
					                        resultDTO.setResultExplain("公安部与居民库姓名不相同"); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                    } else { | 
					 | 
					 | 
					                    } else { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					                        recordEntity.setType("1"); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                        recordEntity.setIdentical("1"); | 
					 | 
					 | 
					                        recordEntity.setIdentical("1"); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                    } | 
					 | 
					 | 
					                    } | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                } | 
					 | 
					 | 
					                } | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
							
								
							
						
						
					 | 
					@ -180,11 +183,11 @@ public class IcResiComparisonRecordServiceImpl extends BaseServiceImpl<IcResiCom | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                if (null == sfhyxxcxdsjjResult || sfhyxxcxdsjjResult.getCode() != 200) { | 
					 | 
					 | 
					                if (null == sfhyxxcxdsjjResult || sfhyxxcxdsjjResult.getCode() != 200) { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                    recordEntity.setComparisonResult("接口调用失败"); | 
					 | 
					 | 
					                    recordEntity.setComparisonResult("接口调用失败"); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                } else { | 
					 | 
					 | 
					                } else { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                    //数据已处理
 | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                    recordEntity.setType("1"); | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                    //公安部不存在的数据
 | 
					 | 
					 | 
					                    //公安部不存在的数据
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                    if (CollectionUtils.isEmpty(sfhyxxcxdsjjResult.getData().getResult())) { | 
					 | 
					 | 
					                    if (CollectionUtils.isEmpty(sfhyxxcxdsjjResult.getData().getResult())) { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                        recordEntity.setComparisonResult("公安部身份证号对应数据不存在"); | 
					 | 
					 | 
					                        recordEntity.setComparisonResult("公安部身份证号对应数据不存在"); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					                        //数据不一致的赋值为未处理信息不一致(空)
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					                        recordEntity.setType("0"); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                        //代表程序干活了
 | 
					 | 
					 | 
					                        //代表程序干活了
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                        recordEntity.setIdentical("2"); | 
					 | 
					 | 
					                        recordEntity.setIdentical("2"); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                    } else {//在公安部查询到了数据
 | 
					 | 
					 | 
					                    } else {//在公安部查询到了数据
 | 
				
			
			
		
	
	
		
		
			
				
					| 
						
						
						
							
								
							
						
					 | 
					@ -192,9 +195,12 @@ public class IcResiComparisonRecordServiceImpl extends BaseServiceImpl<IcResiCom | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                        recordEntity.setPoliceIdCard(sfhyxxcxdsjjResult.getData().getResult().get(0).getGMSFHM()); | 
					 | 
					 | 
					                        recordEntity.setPoliceIdCard(sfhyxxcxdsjjResult.getData().getResult().get(0).getGMSFHM()); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                        //公安部跟居民库姓名不一致
 | 
					 | 
					 | 
					                        //公安部跟居民库姓名不一致
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                        if (!o.getName().equals(sfhyxxcxdsjjResult.getData().getResult().get(0).getXM())) { | 
					 | 
					 | 
					                        if (!o.getName().equals(sfhyxxcxdsjjResult.getData().getResult().get(0).getXM())) { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					                            //姓名不一致的赋值为未处理信息不一致(否)
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					                            recordEntity.setType("0"); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                            recordEntity.setIdentical("0"); | 
					 | 
					 | 
					                            recordEntity.setIdentical("0"); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                            recordEntity.setComparisonResult("公安部与居民库姓名不相同"); | 
					 | 
					 | 
					                            recordEntity.setComparisonResult("公安部与居民库姓名不相同"); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                        } else { | 
					 | 
					 | 
					                        } else { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					                            recordEntity.setType("1"); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                            recordEntity.setIdentical("1"); | 
					 | 
					 | 
					                            recordEntity.setIdentical("1"); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                        } | 
					 | 
					 | 
					                        } | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                    } | 
					 | 
					 | 
					                    } | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
							
								
							
						
						
					 | 
					@ -288,11 +294,11 @@ public class IcResiComparisonRecordServiceImpl extends BaseServiceImpl<IcResiCom | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                if (null == sfhyxxcxdsjjResult || sfhyxxcxdsjjResult.getCode() != 200) { | 
					 | 
					 | 
					                if (null == sfhyxxcxdsjjResult || sfhyxxcxdsjjResult.getCode() != 200) { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                    o.setComparisonResult("接口调用失败"); | 
					 | 
					 | 
					                    o.setComparisonResult("接口调用失败"); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                } else { | 
					 | 
					 | 
					                } else { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                    //数据已处理
 | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                    o.setType("1"); | 
					 | 
					 | 
					 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                    //公安部不存在的数据
 | 
					 | 
					 | 
					                    //公安部不存在的数据
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                    if (CollectionUtils.isEmpty(sfhyxxcxdsjjResult.getData().getResult())) { | 
					 | 
					 | 
					                    if (CollectionUtils.isEmpty(sfhyxxcxdsjjResult.getData().getResult())) { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                        o.setComparisonResult("公安部身份证号对应数据不存在"); | 
					 | 
					 | 
					                        o.setComparisonResult("公安部身份证号对应数据不存在"); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					                        //数据不一致的赋值为未处理信息不一致(空)
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					                        o.setType("0"); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                        //代表程序干活了
 | 
					 | 
					 | 
					                        //代表程序干活了
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                        o.setIdentical("2"); | 
					 | 
					 | 
					                        o.setIdentical("2"); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                    } else {//在公安部查询到了数据
 | 
					 | 
					 | 
					                    } else {//在公安部查询到了数据
 | 
				
			
			
		
	
	
		
		
			
				
					| 
						
						
						
							
								
							
						
					 | 
					@ -300,9 +306,12 @@ public class IcResiComparisonRecordServiceImpl extends BaseServiceImpl<IcResiCom | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                        o.setPoliceIdCard(sfhyxxcxdsjjResult.getData().getResult().get(0).getGMSFHM()); | 
					 | 
					 | 
					                        o.setPoliceIdCard(sfhyxxcxdsjjResult.getData().getResult().get(0).getGMSFHM()); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                        //公安部跟居民库姓名不一致
 | 
					 | 
					 | 
					                        //公安部跟居民库姓名不一致
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                        if (!o.getResiName().equals(sfhyxxcxdsjjResult.getData().getResult().get(0).getXM())) { | 
					 | 
					 | 
					                        if (!o.getResiName().equals(sfhyxxcxdsjjResult.getData().getResult().get(0).getXM())) { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					                            //姓名不一致的赋值为未处理信息不一致(否)
 | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					                            o.setType("0"); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                            o.setIdentical("0"); | 
					 | 
					 | 
					                            o.setIdentical("0"); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                            o.setComparisonResult("公安部与居民库姓名不相同"); | 
					 | 
					 | 
					                            o.setComparisonResult("公安部与居民库姓名不相同"); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                        } else { | 
					 | 
					 | 
					                        } else { | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					 | 
					 | 
					 | 
					                            o.setType("1"); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                            o.setIdentical("1"); | 
					 | 
					 | 
					                            o.setIdentical("1"); | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                        } | 
					 | 
					 | 
					                        } | 
				
			
			
		
	
		
		
			
				
					 | 
					 | 
					                    } | 
					 | 
					 | 
					                    } | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
					
  |