Merge branch 'open_v2' into 'master'

江南行房源第五版

See merge request !780
This commit is contained in:
2023-12-28 10:01:31 +08:00
@@ -244,11 +244,9 @@ public class CzbankSampleServiceImpl implements CzbankSampleService {
// List<District> districts = districtService.findNearestDistrict(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) {
List<String> arroundNnames = new ArrayList<String>();
List<String> arroundKeys = new ArrayList<String>();
d = districtService.findById(d.getId());
if(district.getName().equals(d.getName())){
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()) {
SampleWrapper standardSample = createStandardSample(queryBean);