Merge branch 'script_gj' of http://gitlab.fangjia.com/dev0/main into script_gj

This commit is contained in:
2025-11-10 08:34:14 +08:00
@@ -1196,9 +1196,18 @@ public class PropertyController {
int orgAvgPrice = 0;
if (districtStatBo != null) {
if (StringUtils.isNotBlank(district.getEstateType2()) && district.getEstateType2().contains("±ðÊû") && districtStatBo.getVillaDistrictStat() != null) {
orgAvgPrice = districtStatBo.getVillaDistrictStat().getAvgPrice();
if(districtStatBo.getVillaDistrictStat().getAvg_price_2b() != null && districtStatBo.getVillaDistrictStat().getAvg_price_2b() > 0){
orgAvgPrice = districtStatBo.getVillaDistrictStat().getAvg_price_2b();
}else{
orgAvgPrice = districtStatBo.getVillaDistrictStat().getAvgPrice();
}
} else if (districtStatBo.getDistrictStat() != null) {
orgAvgPrice = districtStatBo.getDistrictStat().getAvgPrice();
if(districtStatBo.getDistrictStat().getAvg_price_2b() != null && districtStatBo.getDistrictStat().getAvg_price_2b() > 0){
orgAvgPrice = districtStatBo.getDistrictStat().getAvg_price_2b();
}else{
orgAvgPrice = districtStatBo.getDistrictStat().getAvgPrice();
}
}
}
if (evaluation != null && evaluation.getAvgPrice() != null && evaluation.getAvgPrice() > 0) {