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 7cdc39f54..f31580327 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 @@ -5150,6 +5150,16 @@ 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); + if (MapUtils.isNotEmpty(trendsMap)) { + Map distMap = (Map) trendsMap.get("distMap"); + Map trendMap = (Map) distMap.get(String.valueOf(trendsMap.get("room"))); + if (MapUtils.isNotEmpty(trendMap)) { + for (String key : trendMap.keySet()) { + Double totalPrice = (trendMap.get(key) * evaluation.getArea()); + trendMap.put(key, totalPrice.intValue()); + } + } + } districtPriceMap.put("trends", trendsMap); 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 f70911f8b..315da818c 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 @@ -32,6 +32,7 @@ import org.apache.batik.transcoder.TranscoderException; import org.apache.batik.transcoder.TranscoderInput; import org.apache.batik.transcoder.TranscoderOutput; import org.apache.batik.transcoder.image.PNGTranscoder; +import org.apache.commons.collections.MapUtils; import org.apache.commons.lang.StringUtils; import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause; @@ -285,6 +286,16 @@ public class CcbRentController { //近一年户型租金走势 Map trendsMap = districtRoomSqmetreRentService.getRentTrends(district.getCity(), district.getRegion(), district.getName(), room, -12); + if (MapUtils.isNotEmpty(trendsMap)) { + Map distMap = (Map) trendsMap.get("distMap"); + Map trendMap = (Map) distMap.get(String.valueOf(trendsMap.get("room"))); + if (MapUtils.isNotEmpty(trendMap)) { + for (String key : trendMap.keySet()) { + Double totalPrice = (trendMap.get(key) * evaluation.getArea()); + trendMap.put(key, totalPrice.intValue()); + } + } + } districtPriceMap.put("trends", trendsMap); // 生成走势图图片,一遍转pdf