城市、区域、小区价格指数
This commit is contained in:
+1
-1
@@ -1170,7 +1170,7 @@ public class HouseController {
|
||||
|| statsIndex.getBelowFixedbase() == null) {
|
||||
return null;
|
||||
}
|
||||
Date endDate = DateUtil.parseDate(statsIndex.getYearmonth(), "yyyyMM");
|
||||
Date endDate = DateUtil.parseDate(statsIndex.getYearmonth().toString(), "yyyyMM");
|
||||
Calendar c = Calendar.getInstance();
|
||||
c.setTime(endDate);
|
||||
c.add(Calendar.MONTH, -1);
|
||||
|
||||
+12
-12
@@ -51,7 +51,7 @@ public class StatsIndexController {
|
||||
mav.setModel(BasicModel.buildBadRequestModel("请输入城市编码"));
|
||||
return mav;
|
||||
}
|
||||
if (StringUtils.isBlank(model.getYearmonth())) {
|
||||
if (null == model.getYearmonth()) {
|
||||
mav.setModel(BasicModel.buildBadRequestModel("请输入要查询的年月"));
|
||||
return mav;
|
||||
}
|
||||
@@ -106,7 +106,7 @@ public class StatsIndexController {
|
||||
mav.setModel(BasicModel.buildBadRequestModel("请输入区域编码"));
|
||||
return mav;
|
||||
}
|
||||
if (StringUtils.isBlank(model.getYearmonth())) {
|
||||
if (null == model.getYearmonth()) {
|
||||
mav.setModel(BasicModel.buildBadRequestModel("请输入要查询的年月"));
|
||||
return mav;
|
||||
}
|
||||
@@ -147,7 +147,7 @@ public class StatsIndexController {
|
||||
mav.setModel(BasicModel.buildBadRequestModel("请输入小区id"));
|
||||
return mav;
|
||||
}
|
||||
if (StringUtils.isBlank(model.getYearmonth())) {
|
||||
if (null == model.getYearmonth()) {
|
||||
mav.setModel(BasicModel.buildBadRequestModel("请输入要查询的年月"));
|
||||
return mav;
|
||||
}
|
||||
@@ -157,7 +157,7 @@ public class StatsIndexController {
|
||||
return mav;
|
||||
}
|
||||
Map<String, Object> resMap = new HashMap<String, Object>();
|
||||
PropertyStatsIndex statsIndex = propertyStatsIndexService.findStatsIndex(district.getCity(), district.getRegion(), district.getName(), model.getYearmonth(), model.getCat());
|
||||
PropertyStatsIndex statsIndex = propertyStatsIndexService.findStatsIndex(district.getCity(), district.getRegion(), district.getName(), model.getYearmonth());
|
||||
if (statsIndex != null) {
|
||||
PropertyStatsIndex newStatsIndex = new PropertyStatsIndex();
|
||||
newStatsIndex.setChain(statsIndex.getChain());
|
||||
@@ -191,7 +191,7 @@ public class StatsIndexController {
|
||||
}
|
||||
model.setCity(cityName);
|
||||
}
|
||||
if (StringUtils.isBlank(model.getYearmonth())) {
|
||||
if (null == model.getYearmonth()) {
|
||||
mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "年月必须输入,格式:yyyyMM"));
|
||||
return mav;
|
||||
}
|
||||
@@ -202,7 +202,7 @@ public class StatsIndexController {
|
||||
for (StatsIndex statsIndex : statsIndexs) {
|
||||
IndexBo newStatsIndex = new IndexBo();
|
||||
newStatsIndex.setCity(DistrictCodeUtils.getCityCode(statsIndex.getCity()));
|
||||
newStatsIndex.setYearmonth(statsIndex.getYearmonth());
|
||||
newStatsIndex.setYearmonth(statsIndex.getYearmonth().toString());
|
||||
newStatsIndex.setMOM(statsIndex.getChain());
|
||||
newStatsIndex.setYOY(statsIndex.getYeartoyear());
|
||||
newStatsIndex.setFixedBase(statsIndex.getFixedbase());
|
||||
@@ -242,7 +242,7 @@ public class StatsIndexController {
|
||||
}
|
||||
model.setCity(cityName);
|
||||
}
|
||||
if (StringUtils.isBlank(model.getYearmonth())) {
|
||||
if (null == model.getYearmonth()) {
|
||||
mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "年月必须输入,格式:yyyyMM"));
|
||||
return mav;
|
||||
}
|
||||
@@ -265,7 +265,7 @@ public class StatsIndexController {
|
||||
newStatsIndex.setLargeFixedBase(statsIndex.getAboveFixedbase());
|
||||
|
||||
newStatsIndex.setCity(DistrictCodeUtils.getCityCode(statsIndex.getCity()));
|
||||
newStatsIndex.setYearmonth(statsIndex.getYearmonth());
|
||||
newStatsIndex.setYearmonth(statsIndex.getYearmonth().toString());
|
||||
newStatsIndex.setSource(String.valueOf(statsIndex.getSource()));
|
||||
if (StringUtils.isNotBlank(newStatsIndex.getCity())) {
|
||||
statsIndexList.add(newStatsIndex);
|
||||
@@ -304,7 +304,7 @@ public class StatsIndexController {
|
||||
}
|
||||
model.setCity(cityName);
|
||||
}
|
||||
if (StringUtils.isBlank(model.getYearmonth())) {
|
||||
if (null == model.getYearmonth()) {
|
||||
mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "年月必须输入,格式:yyyyMM"));
|
||||
return mav;
|
||||
}
|
||||
@@ -317,7 +317,7 @@ public class StatsIndexController {
|
||||
newStatsIndex.setMOM(statsIndex.getFangChain());
|
||||
newStatsIndex.setIndex(statsIndex.getFangIndex());
|
||||
newStatsIndex.setCity(DistrictCodeUtils.getCityCode(statsIndex.getCity()));
|
||||
newStatsIndex.setYearmonth(statsIndex.getYearmonth());
|
||||
newStatsIndex.setYearmonth(statsIndex.getYearmonth().toString());
|
||||
newStatsIndex.setSource(String.valueOf(statsIndex.getSource()));
|
||||
if (StringUtils.isNotBlank(newStatsIndex.getCity())) {
|
||||
statsIndexList.add(newStatsIndex);
|
||||
@@ -354,7 +354,7 @@ public class StatsIndexController {
|
||||
}
|
||||
model.setCity(cityName);
|
||||
}
|
||||
if (StringUtils.isBlank(model.getYearmonth())) {
|
||||
if (null == model.getYearmonth()) {
|
||||
mav.setModel(new HttpCode(OpenHttpCodeEnum.ARGUMENT_LOSE, "年月必须输入,格式:yyyyMM"));
|
||||
return mav;
|
||||
}
|
||||
@@ -368,7 +368,7 @@ public class StatsIndexController {
|
||||
newStatsIndex.setMOM(statsIndex.getFangChain());
|
||||
newStatsIndex.setIndex(statsIndex.getFangIndex());
|
||||
newStatsIndex.setCity(DistrictCodeUtils.getCityCode(statsIndex.getCity()));
|
||||
newStatsIndex.setYearmonth(statsIndex.getYearmonth());
|
||||
newStatsIndex.setYearmonth(statsIndex.getYearmonth().toString());
|
||||
newStatsIndex.setSource(String.valueOf(statsIndex.getSource()));
|
||||
if (StringUtils.isNotBlank(newStatsIndex.getCity())) {
|
||||
statsIndexList.add(newStatsIndex);
|
||||
|
||||
@@ -14,7 +14,7 @@ public class StatsIndexModel {
|
||||
private String name;
|
||||
private String type;
|
||||
|
||||
private String yearmonth;
|
||||
private Integer yearmonth;
|
||||
|
||||
private Integer source;
|
||||
|
||||
@@ -68,11 +68,11 @@ public class StatsIndexModel {
|
||||
this.city = city;
|
||||
}
|
||||
|
||||
public String getYearmonth() {
|
||||
public Integer getYearmonth() {
|
||||
return yearmonth;
|
||||
}
|
||||
|
||||
public void setYearmonth(String yearmonth) {
|
||||
public void setYearmonth(Integer yearmonth) {
|
||||
this.yearmonth = yearmonth;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user