+13
-15
@@ -244,11 +244,9 @@ public class CzbankSampleServiceImpl implements CzbankSampleService {
|
|||||||
// List<District> districts = districtService.findNearestDistrict(district, 1000, 5);
|
// List<District> districts = districtService.findNearestDistrict(district, 1000, 5);
|
||||||
List<District> districts = districtService.doFindNearestHasHouseDistrict(district, 1000, 5);
|
List<District> districts = districtService.doFindNearestHasHouseDistrict(district, 1000, 5);
|
||||||
|
|
||||||
|
List<String> arroundNnames = new ArrayList<String>();
|
||||||
|
List<String> arroundKeys = new ArrayList<String>();
|
||||||
for (District d : districts) {
|
for (District d : districts) {
|
||||||
|
|
||||||
List<String> arroundNnames = new ArrayList<String>();
|
|
||||||
List<String> arroundKeys = new ArrayList<String>();
|
|
||||||
|
|
||||||
d = districtService.findById(d.getId());
|
d = districtService.findById(d.getId());
|
||||||
if(district.getName().equals(d.getName())){
|
if(district.getName().equals(d.getName())){
|
||||||
continue;
|
continue;
|
||||||
@@ -269,19 +267,19 @@ public class CzbankSampleServiceImpl implements CzbankSampleService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
List<SampleWrapper> nearlySample = findJnbankSampleByDistrict(district, arroundKeys, arroundNnames, queryBean.getPropertyTypeCode(), queryBean.getUpdateDate(), districtStat);
|
|
||||||
|
|
||||||
for (SampleWrapper sample : nearlySample) {
|
|
||||||
sample.setProperty(district);
|
|
||||||
}
|
|
||||||
sortForSample(nearlySample, target);
|
|
||||||
querySamples.addAll(nearlySample);
|
|
||||||
if (querySamples.size() > max) {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
List<SampleWrapper> nearlySample = findJnbankSampleByDistrict(district, arroundKeys, arroundNnames, queryBean.getPropertyTypeCode(), queryBean.getUpdateDate(), districtStat);
|
||||||
|
|
||||||
|
for (SampleWrapper sample : nearlySample) {
|
||||||
|
sample.setProperty(district);
|
||||||
|
}
|
||||||
|
sortForSample(nearlySample, target);
|
||||||
|
querySamples.addAll(nearlySample);
|
||||||
|
// if (querySamples.size() > max) {
|
||||||
|
// break;
|
||||||
|
// }
|
||||||
|
|
||||||
}
|
}
|
||||||
if (querySamples.isEmpty()) {
|
if (querySamples.isEmpty()) {
|
||||||
SampleWrapper standardSample = createStandardSample(queryBean);
|
SampleWrapper standardSample = createStandardSample(queryBean);
|
||||||
|
|||||||
Reference in New Issue
Block a user