小区月度价格从月度均价表查
This commit is contained in:
+44
-23
@@ -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<DistrictStat> 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<Map<String, Object>> result = new ArrayList<Map<String, Object>>(model.getPeriodCount());
|
||||
for (DistrictStat districtStat : districtStats) {
|
||||
Map<String, Object> item = new LinkedHashMap<String, Object>();
|
||||
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<DistrictStat> 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<String, Object> item = new LinkedHashMap<String, Object>();
|
||||
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<DistrictSellStat> monthsData = districtSellStatService.getAllWithMonths(model.getCity(),
|
||||
model.getDistrict(), model.getName(), model.getPeriodCount());
|
||||
if (monthsData != null && monthsData.size() > 0) {
|
||||
for (DistrictSellStat districtStat : monthsData) {
|
||||
Map<String, Object> item = new LinkedHashMap<String, Object>();
|
||||
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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user