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 586c407b6..0d2b2f2ff 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 @@ -7,6 +7,7 @@ import java.io.IOException; import java.io.InputStreamReader; import java.io.OutputStream; import java.math.BigDecimal; +import java.math.RoundingMode; import java.net.URLEncoder; import java.nio.charset.Charset; import java.text.ParseException; @@ -759,7 +760,7 @@ public class PropertyController { //int avgPrice = districtStatService.findLatestDistrictAvgPrice(new DistrictKey(district), null); // 返回2B价格,小程序用,其他也改为2B int avgPrice = districtStatService.findLatestDistrictAvgPrice2B(new DistrictKey(district), null); - if(avgPrice == 0){ + if (avgPrice == 0) { avgPrice = districtStatService.findLatestDistrictAvgPrice2B(new DistrictKey(district), DateUtil.add(new Date(), -7)); } if (avgPrice != 0) { @@ -2433,32 +2434,52 @@ public class PropertyController { } else { calendar.add(Calendar.MONTH, -model.getPeriodCount().intValue()); } - - List districtStats = districtStatService.findAllDistrictStatByNameWithPadding(district.getCity(), - district.getRegion(), district.getName(), district.getEstateType2(), calendar.getTime(), new Date(), - model.getPeriodType()); - if (districtStats.size() > model.getPeriodCount()) { - districtStats = districtStats.subList(districtStats.size() - model.getPeriodCount(), districtStats.size()); - } List> result = new ArrayList>(model.getPeriodCount()); - for (DistrictStat districtStat : districtStats) { - Map item = new LinkedHashMap(); - item.put("city", districtStat.getCity()); - item.put("district", districtStat.getRegion()); - item.put("name", districtStat.getDistrictName()); - if (districtStat.getAvg_price_2b() != null) { - item.put("avgPrice", districtStat.getAvg_price_2b()); - } else { - item.put("avgPrice", districtStat.getAvgPrice()); + + if ("weekly".equals(model.getPeriodType())) { + List districtStats = districtStatService.findAllDistrictStatByNameWithPadding(district.getCity(), + district.getRegion(), district.getName(), district.getEstateType2(), calendar.getTime(), new Date(), + model.getPeriodType()); + if (districtStats.size() > model.getPeriodCount()) { + districtStats = districtStats.subList(districtStats.size() - model.getPeriodCount(), districtStats.size()); } - if ("monthly".equals(model.getPeriodType())) { - item.put("date", DateUtil.formatByPattern(districtStat.getWeekend(), "yyyy-MM")); - } else { - item.put("date", DateUtil.formatByPattern(districtStat.getWeekend(), "yyyy-MM-dd")); + for (DistrictStat districtStat : districtStats) { + Map item = new LinkedHashMap(); + item.put("city", districtStat.getCity()); + item.put("district", districtStat.getRegion()); + item.put("name", districtStat.getDistrictName()); + if (districtStat.getAvg_price_2b() != null) { + item.put("avgPrice", districtStat.getAvg_price_2b()); + } else { + item.put("avgPrice", districtStat.getAvgPrice()); + } + if ("monthly".equals(model.getPeriodType())) { + item.put("date", DateUtil.formatByPattern(districtStat.getWeekend(), "yyyy-MM")); + } else { + item.put("date", DateUtil.formatByPattern(districtStat.getWeekend(), "yyyy-MM-dd")); + } + item.put("changePercent", districtStat.getMarkup() / 100d); + result.add(item); + } + } else { + List monthsData = districtSellStatService.getAllWithMonths(model.getCity(), + model.getDistrict(), model.getName(), model.getPeriodCount()); + if (monthsData != null && monthsData.size() > 0) { + for (DistrictSellStat districtStat : monthsData) { + Map item = new LinkedHashMap(); + item.put("city", districtStat.getCity()); + item.put("district", districtStat.getRegion()); + item.put("name", districtStat.getDistrictName()); + item.put("avgPrice", districtStat.getAvgPrice()); + item.put("date", districtStat.getDate() / 100 + "-" + String.format("%02d", districtStat.getDate() % 100)); + item.put("changePercent", BigDecimal.valueOf(districtStat.getMom() * 100) + .setScale(2, RoundingMode.HALF_UP) + .doubleValue()); + result.add(item); + } } - item.put("changePercent", districtStat.getMarkup() / 100d); - result.add(item); } + mav.setModel(BasicModel.buildOKModel().setResult(result)); return mav; }