diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java index e75123689..1ba157ee5 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java @@ -5295,8 +5295,8 @@ public class PropertyController { //近一年户型租金走势 - Map trendsMap = districtRoomSqmetreRentService.getRentTrends(district.getCity(), district.getRegion(), district.getName(), room, -12); -// Map trendsMap = districtStatRentService.getRentTrend(district.getCity(), district.getRegion(), district.getDistrictName(), -12); + // Map trendsMap = districtRoomSqmetreRentService.getRentTrends(district.getCity(), district.getRegion(), district.getName(), room, -12); + Map trendsMap = districtStatRentService.getRentTrend(district.getCity(), district.getRegion(), district.getDistrictName(), -12); if (MapUtils.isNotEmpty(trendsMap)) { Map distMap = (Map) trendsMap.get("distMap"); Map trendMap = (Map) distMap.get(String.valueOf(trendsMap.get("room"))); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/CcbRentController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/CcbRentController.java index 6f3646ad6..2dd5ab077 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/CcbRentController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/CcbRentController.java @@ -22,6 +22,7 @@ import com.fangjia.service.datastore.DistrictService; import com.fangjia.service.datastore.EvaluationService; import com.fangjia.service.datastore.HouseService; import com.fangjia.service.district.DistrictRoomSqmetreRentService; +import com.fangjia.service.district.DistrictStatRentService; import com.fangjia.service.district.RentDealPriceService; import com.fangjia.service.mongo.fangjia.FileService; import com.fangjia.service.mongo.fangjia.SeawaterService; @@ -67,6 +68,7 @@ public class CcbRentController { private DistrictService districtService; private SeawaterService seawaterService; + private DistrictStatRentService districtStatRentService; private DistrictRoomSqmetreRentService districtRoomSqmetreRentService; private EvaluationService evaluationService; private HouseService houseService; @@ -286,7 +288,8 @@ public class CcbRentController { } //近一年户型租金走势 - Map trendsMap = districtRoomSqmetreRentService.getRentTrends(district.getCity(), district.getRegion(), district.getName(), room, -12); + //Map trendsMap = districtRoomSqmetreRentService.getRentTrends(district.getCity(), district.getRegion(), district.getName(), room, -12); + Map trendsMap = districtStatRentService.getRentTrend(district.getCity(), district.getRegion(), district.getDistrictName(), -12); if (MapUtils.isNotEmpty(trendsMap)) { Map distMap = (Map) trendsMap.get("distMap"); Map trendMap = (Map) distMap.get(String.valueOf(trendsMap.get("room"))); @@ -653,4 +656,8 @@ public class CcbRentController { public void setFileService(FileService fileService) { this.fileService = fileService; } + + public void setDistrictStatRentService(DistrictStatRentService districtStatRentService) { + this.districtStatRentService = districtStatRentService; + } }