Merge remote-tracking branch 'origin/master'
This commit is contained in:
+7
-4
@@ -6880,7 +6880,7 @@ public class PropertyController {
|
||||
}
|
||||
|
||||
List<AverageStatistics> statsList = averageStatisticsService.findRecentMonths(
|
||||
district.getCity(), district.getRegion(), district.getName(), district.getCategory(), 3);
|
||||
district.getCity(), district.getRegion(), district.getName(), district.getCategory(), 5);
|
||||
|
||||
UniversalDto result = UniversalDto.newDto();
|
||||
result.append("id", id);
|
||||
@@ -6913,6 +6913,9 @@ public class PropertyController {
|
||||
if (lianjiaAvgPrice == null && stats.getLianjiaEsfPrice() != null && stats.getLianjiaEsfPrice() > 0) {
|
||||
lianjiaAvgPrice = stats.getLianjiaEsfPrice();
|
||||
}
|
||||
if (lianjiaAvgPrice == null && stats.getBeikeEsfPrice() != null && stats.getBeikeEsfPrice() > 0) {
|
||||
lianjiaAvgPrice = stats.getBeikeEsfPrice();
|
||||
}
|
||||
if (cityhouseAvgPrice == null && stats.getCityhouseEsfPrice() != null && stats.getCityhouseEsfPrice() > 0) {
|
||||
cityhouseAvgPrice = stats.getCityhouseEsfPrice();
|
||||
}
|
||||
@@ -6947,9 +6950,9 @@ public class PropertyController {
|
||||
result.append("maitianAvgPrice", null);
|
||||
}
|
||||
|
||||
List<UniversalDto> resultList = new ArrayList<UniversalDto>();
|
||||
resultList.add(result);
|
||||
mav.setModel(BasicModel.buildOKModel().setResult(resultList));
|
||||
// List<UniversalDto> resultList = new ArrayList<UniversalDto>();
|
||||
// resultList.add(result);
|
||||
mav.setModel(BasicModel.buildOKModel().setResult(result));
|
||||
return mav;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user