Merge branch 'feature_master_xh_standard' into 'master'
第三方均价展示 See merge request !356
This commit is contained in:
@@ -227,7 +227,7 @@
|
||||
<td colspan="2"><b>兔博士</b></td>
|
||||
</#if>
|
||||
|
||||
<#if (it.centanetNewPrice)?? || (it.centanetEsfPrice)??>
|
||||
<#if (it.zhongyuanNewPrice)?? || (it.zhongyuanEsfPrice)??>
|
||||
<td colspan="2"><b>中原地产</b></td>
|
||||
</#if>
|
||||
<#if (it.leyoujiaNewPrice)?? || (it.leyoujiaEsfPrice)??>
|
||||
@@ -247,7 +247,13 @@
|
||||
</#if>
|
||||
<#if (it.yungujiaNewPrice)?? || (it.yungujiaEsfPrice)??>
|
||||
<td colspan="2"><b>云估价</b></td>
|
||||
</#if>
|
||||
</#if>
|
||||
<#if (it.jiwuNewPrice)?? || (it.jiwuEsfPrice)??>
|
||||
<td colspan="2"><b>吉屋</b></td>
|
||||
</#if>
|
||||
<#if (it.tsfhouseNewPrice)?? || (it.tsfhouseEsfPrice)??>
|
||||
<td colspan="2"><b>365房产</b></td>
|
||||
</#if>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
@@ -300,7 +306,7 @@
|
||||
<td style="width:70px;color:#D3750A">二手房</td>
|
||||
</#if>
|
||||
|
||||
<#if (it.centanetNewPrice)?? || (it.centanetEsfPrice)??>
|
||||
<#if (it.zhongyuanNewPrice)?? || (it.zhongyuanEsfPrice)??>
|
||||
<td style="width:70px;color:#0C88C7">新房</td>
|
||||
<td style="width:70px;color:#D3750A">二手房</td>
|
||||
</#if>
|
||||
@@ -329,10 +335,17 @@
|
||||
</#if>
|
||||
<#if (it.yungujiaNewPrice)?? || (it.yungujiaEsfPrice)??>
|
||||
<td style="width:70px;color:#0C88C7">新房</td>
|
||||
<td style="width:70px;color:#D3750A">二手房</td>
|
||||
|
||||
<td style="width:70px;color:#D3750A">二手房</td>
|
||||
</#if>
|
||||
|
||||
<#if (it.jiwuNewPrice)?? || (it.jiwuEsfPrice)??>
|
||||
<td style="width:70px;color:#0C88C7">新房</td>
|
||||
<td style="width:70px;color:#D3750A">二手房</td>
|
||||
</#if>
|
||||
<#if (it.tsfhouseNewPrice)?? || (it.tsfhouseEsfPrice)??>
|
||||
<td style="width:70px;color:#0C88C7">新房</td>
|
||||
<td style="width:70px;color:#D3750A">二手房</td>
|
||||
</#if>
|
||||
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
@@ -392,9 +405,9 @@
|
||||
<td style ="color:#D3750A">${it.tuboshiEsfPrice!}</td>
|
||||
</#if>
|
||||
|
||||
<#if (it.centanetNewPrice)?? || (it.centanetEsfPrice)??>
|
||||
<td style ="color:#0C88C7">${it.centanetNewPrice!}</td>
|
||||
<td style ="color:#D3750A">${it.centanetEsfPrice!}</td>
|
||||
<#if (it.zhongyuanNewPrice)?? || (it.zhongyuanEsfPrice)??>
|
||||
<td style ="color:#0C88C7">${it.zhongyuanNewPrice!}</td>
|
||||
<td style ="color:#D3750A">${it.zhongyuanEsfPrice!}</td>
|
||||
</#if>
|
||||
|
||||
<#if (it.leyoujiaNewPrice)?? || (it.leyoujiaEsfPrice)??>
|
||||
@@ -422,7 +435,15 @@
|
||||
<td style ="color:#0C88C7">${it.yungujiaNewPrice!}</td>
|
||||
<td style ="color:#D3750A">${it.yungujiaEsfPrice!}</td>
|
||||
</#if>
|
||||
|
||||
<#if (it.jiwuNewPrice)?? || (it.jiwuEsfPrice)??>
|
||||
<td style ="color:#0C88C7">${it.jiwuNewPrice!}</td>
|
||||
<td style ="color:#D3750A">${it.jiwuEsfPrice!}</td>
|
||||
</#if>
|
||||
<#if (it.tsfhouseNewPrice)?? || (it.tsfhouseEsfPrice)??>
|
||||
<td style ="color:#0C88C7">${it.tsfhouseNewPrice!}</td>
|
||||
<td style ="color:#D3750A">${it.tsfhouseEsfPrice!}</td>
|
||||
</#if>
|
||||
|
||||
</tr>
|
||||
</#list>
|
||||
<#if averageStatistics?size == 0>
|
||||
|
||||
+107
-41
@@ -95,10 +95,10 @@ public class AverageStatistics implements MongoEntity {
|
||||
private Double tuboshiEsfDiff;
|
||||
|
||||
/**中原地产二手房均价*/
|
||||
private Integer centanetNewPrice;
|
||||
private Double centanetNewDiff;
|
||||
private Integer centanetEsfPrice;
|
||||
private Double centanetEsfDiff;
|
||||
private Integer zhongyuanNewPrice;
|
||||
private Double zhongyuanNewDiff;
|
||||
private Integer zhongyuanEsfPrice;
|
||||
private Double zhongyuanEsfDiff;
|
||||
|
||||
|
||||
|
||||
@@ -155,9 +155,18 @@ public class AverageStatistics implements MongoEntity {
|
||||
private Integer zhugezhaofangNewPrice;
|
||||
private Double zhugezhaofangNewDiff;
|
||||
|
||||
|
||||
/**吉屋*/
|
||||
private Integer jiwuEsfPrice;
|
||||
private Double jiwuEsfDiff;
|
||||
private Integer jiwuNewPrice;
|
||||
private Double jiwuNewDiff;
|
||||
|
||||
/**365*/
|
||||
private Integer tsfhouseEsfPrice;
|
||||
private Double tsfhouseEsfDiff;
|
||||
private Integer tsfhouseNewPrice;
|
||||
private Double tsfhouseNewDiff;
|
||||
|
||||
|
||||
private String level;//价格评级
|
||||
private Integer lastAvgPrice;//最终价
|
||||
private String maxDeviate;//偏离度最大的网站,房价网-云估价-房估估
|
||||
@@ -578,22 +587,22 @@ public class AverageStatistics implements MongoEntity {
|
||||
this.fangguguNewPrice = fangguguNewPrice;
|
||||
}
|
||||
|
||||
@Column(name = "centanet_new_price")
|
||||
public Integer getCentanetNewPrice() {
|
||||
return centanetNewPrice;
|
||||
@Column(name = "zhongyuan_new_price")
|
||||
public Integer getZhongyuanNewPrice() {
|
||||
return zhongyuanNewPrice;
|
||||
}
|
||||
|
||||
public void setCentanetNewPrice(Integer centanetNewPrice) {
|
||||
this.centanetNewPrice = centanetNewPrice;
|
||||
public void setZhongyuanNewPrice(Integer zhongyuanNewPrice) {
|
||||
this.zhongyuanNewPrice = zhongyuanNewPrice;
|
||||
}
|
||||
|
||||
@Column(name = "centanet_esf_price")
|
||||
public Integer getCentanetEsfPrice() {
|
||||
return centanetEsfPrice;
|
||||
@Column(name = "zhongyuan_esf_price")
|
||||
public Integer getZhongyuanEsfPrice() {
|
||||
return zhongyuanEsfPrice;
|
||||
}
|
||||
|
||||
public void setCentanetEsfPrice(Integer centanetEsfPrice) {
|
||||
this.centanetEsfPrice = centanetEsfPrice;
|
||||
public void setZhongyuanEsfPrice(Integer zhongyuanEsfPrice) {
|
||||
this.zhongyuanEsfPrice = zhongyuanEsfPrice;
|
||||
}
|
||||
|
||||
@Column(name = "lianjia_esf_price")
|
||||
@@ -659,22 +668,22 @@ public class AverageStatistics implements MongoEntity {
|
||||
this.tuboshiEsfDiff = tuboshiEsfDiff;
|
||||
}
|
||||
|
||||
@Column(name = "centanet_new_diff")
|
||||
public Double getCentanetNewDiff() {
|
||||
return centanetNewDiff;
|
||||
@Column(name = "zhongyuan_new_diff")
|
||||
public Double getZhongyuanNewDiff() {
|
||||
return zhongyuanNewDiff;
|
||||
}
|
||||
|
||||
public void setCentanetNewDiff(Double centanetNewDiff) {
|
||||
this.centanetNewDiff = centanetNewDiff;
|
||||
public void setZhongyuanNewDiff(Double zhongyuanNewDiff) {
|
||||
this.zhongyuanNewDiff = zhongyuanNewDiff;
|
||||
}
|
||||
|
||||
@Column(name = "centanet_esf_diff")
|
||||
public Double getCentanetEsfDiff() {
|
||||
return centanetEsfDiff;
|
||||
@Column(name = "zhongyuan_esf_diff")
|
||||
public Double getZhongyuanEsfDiff() {
|
||||
return zhongyuanEsfDiff;
|
||||
}
|
||||
|
||||
public void setCentanetEsfDiff(Double centanetEsfDiff) {
|
||||
this.centanetEsfDiff = centanetEsfDiff;
|
||||
public void setZhongyuanEsfDiff(Double zhongyuanEsfDiff) {
|
||||
this.zhongyuanEsfDiff = zhongyuanEsfDiff;
|
||||
}
|
||||
|
||||
@Column(name = "master_district_name")
|
||||
@@ -1074,19 +1083,76 @@ public class AverageStatistics implements MongoEntity {
|
||||
public void setFangtanEsfDiff(Double fangtanEsfDiff) {
|
||||
this.fangtanEsfDiff = fangtanEsfDiff;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@Column(name = "jiwu_esf_price")
|
||||
public Integer getJiwuEsfPrice() {
|
||||
return jiwuEsfPrice;
|
||||
}
|
||||
|
||||
public void setJiwuEsfPrice(Integer jiwuEsfPrice) {
|
||||
this.jiwuEsfPrice = jiwuEsfPrice;
|
||||
}
|
||||
|
||||
@Column(name = "jiwu_esf_diff")
|
||||
public Double getJiwuEsfDiff() {
|
||||
return jiwuEsfDiff;
|
||||
}
|
||||
|
||||
public void setJiwuEsfDiff(Double jiwuEsfDiff) {
|
||||
this.jiwuEsfDiff = jiwuEsfDiff;
|
||||
}
|
||||
|
||||
@Column(name = "jiwu_new_price")
|
||||
public Integer getJiwuNewPrice() {
|
||||
return jiwuNewPrice;
|
||||
}
|
||||
|
||||
public void setJiwuNewPrice(Integer jiwuNewPrice) {
|
||||
this.jiwuNewPrice = jiwuNewPrice;
|
||||
}
|
||||
|
||||
@Column(name = "jiwu_new_diff")
|
||||
public Double getJiwuNewDiff() {
|
||||
return jiwuNewDiff;
|
||||
}
|
||||
|
||||
public void setJiwuNewDiff(Double jiwuNewDiff) {
|
||||
this.jiwuNewDiff = jiwuNewDiff;
|
||||
}
|
||||
|
||||
@Column(name = "365house_esf_price")
|
||||
public Integer getTsfhouseEsfPrice() {
|
||||
return tsfhouseEsfPrice;
|
||||
}
|
||||
|
||||
public void setTsfhouseEsfPrice(Integer tsfhouseEsfPrice) {
|
||||
this.tsfhouseEsfPrice = tsfhouseEsfPrice;
|
||||
}
|
||||
|
||||
@Column(name = "365house_esf_diff")
|
||||
public Double getTsfhouseEsfDiff() {
|
||||
return tsfhouseEsfDiff;
|
||||
}
|
||||
|
||||
public void setTsfhouseEsfDiff(Double tsfhouseEsfDiff) {
|
||||
this.tsfhouseEsfDiff = tsfhouseEsfDiff;
|
||||
}
|
||||
|
||||
@Column(name = "365house_new_price")
|
||||
public Integer getTsfhouseNewPrice() {
|
||||
return tsfhouseNewPrice;
|
||||
}
|
||||
|
||||
public void setTsfhouseNewPrice(Integer tsfhouseNewPrice) {
|
||||
this.tsfhouseNewPrice = tsfhouseNewPrice;
|
||||
}
|
||||
|
||||
@Column(name = "365house_new_diff")
|
||||
public Double getTsfhouseNewDiff() {
|
||||
return tsfhouseNewDiff;
|
||||
}
|
||||
|
||||
public void setTsfhouseNewDiff(Double tsfhouseNewDiff) {
|
||||
this.tsfhouseNewDiff = tsfhouseNewDiff;
|
||||
}
|
||||
}
|
||||
|
||||
+4
-4
@@ -187,11 +187,11 @@ public class AverageStatisticsServiceImpl implements AverageStatisticsService {
|
||||
|
||||
Integer zhongyuanPrice = (Integer) dataMap.get("zhongyuan_price");
|
||||
if(null == zhongyuanPrice){
|
||||
if (isValid(entity.getCentanetEsfPrice())) {
|
||||
dataMap.put("zhongyuan_price", entity.getCentanetEsfPrice());
|
||||
if (isValid(entity.getZhongyuanEsfPrice())) {
|
||||
dataMap.put("zhongyuan_price", entity.getZhongyuanEsfPrice());
|
||||
}else{
|
||||
if(isValid(entity.getCentanetNewPrice())){
|
||||
dataMap.put("zhongyuan_price", entity.getCentanetNewPrice());
|
||||
if(isValid(entity.getZhongyuanNewPrice())){
|
||||
dataMap.put("zhongyuan_price", entity.getZhongyuanNewPrice());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user