Merge branch 'open_v2' into 'master'

江南行查房源第二版

See merge request !777
This commit is contained in:
2023-12-27 16:57:17 +08:00
@@ -242,9 +242,12 @@ public class CzbankSampleServiceImpl implements CzbankSampleService {
district = districtService.findOneByKey(new DistrictKey(district.getCity(), district.getRegion(), district.getName()), "district"); district = districtService.findOneByKey(new DistrictKey(district.getCity(), district.getRegion(), district.getName()), "district");
// 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;
@@ -265,17 +268,19 @@ public class CzbankSampleServiceImpl implements CzbankSampleService {
} }
} }
} }
}
List<SampleWrapper> nearlySample = findJnbankSampleByDistrict(district, arroundKeys, arroundNnames, queryBean.getPropertyTypeCode(), queryBean.getUpdateDate(), districtStat);
for (SampleWrapper sample : nearlySample) { List<SampleWrapper> nearlySample = findJnbankSampleByDistrict(district, arroundKeys, arroundNnames, queryBean.getPropertyTypeCode(), queryBean.getUpdateDate(), districtStat);
sample.setProperty(district);
for (SampleWrapper sample : nearlySample) {
sample.setProperty(district);
}
sortForSample(nearlySample, target);
querySamples.addAll(nearlySample);
if (querySamples.size() > max) {
break;
}
} }
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);