diff --git a/projects/fangjia-bkoff/src/main/webapp/avgPriceUpdate/districtDetail.ftl b/projects/fangjia-bkoff/src/main/webapp/avgPriceUpdate/districtDetail.ftl
index 929a94d63..963c8feb8 100644
--- a/projects/fangjia-bkoff/src/main/webapp/avgPriceUpdate/districtDetail.ftl
+++ b/projects/fangjia-bkoff/src/main/webapp/avgPriceUpdate/districtDetail.ftl
@@ -227,7 +227,7 @@
兔�士 |
#if>
- <#if (it.centanetNewPrice)?? || (it.centanetEsfPrice)??>
+ <#if (it.zhongyuanNewPrice)?? || (it.zhongyuanEsfPrice)??>
ä¸åŽŸåœ°äº§ |
#if>
<#if (it.leyoujiaNewPrice)?? || (it.leyoujiaEsfPrice)??>
@@ -247,7 +247,13 @@
#if>
<#if (it.yungujiaNewPrice)?? || (it.yungujiaEsfPrice)??>
云估价 |
- #if>
+ #if>
+ <#if (it.jiwuNewPrice)?? || (it.jiwuEsfPrice)??>
+ �屋 |
+ #if>
+ <#if (it.tsfhouseNewPrice)?? || (it.tsfhouseEsfPrice)??>
+ 365房产 |
+ #if>
@@ -300,7 +306,7 @@
| 二手房 |
#if>
- <#if (it.centanetNewPrice)?? || (it.centanetEsfPrice)??>
+ <#if (it.zhongyuanNewPrice)?? || (it.zhongyuanEsfPrice)??>
新房 |
二手房 |
#if>
@@ -329,10 +335,17 @@
#if>
<#if (it.yungujiaNewPrice)?? || (it.yungujiaEsfPrice)??>
新房 |
- 二手房 |
-
+ 二手房 |
#if>
-
+ <#if (it.jiwuNewPrice)?? || (it.jiwuEsfPrice)??>
+ 新房 |
+ 二手房 |
+ #if>
+ <#if (it.tsfhouseNewPrice)?? || (it.tsfhouseEsfPrice)??>
+ 新房 |
+ 二手房 |
+ #if>
+
@@ -392,9 +405,9 @@
| ${it.tuboshiEsfPrice!} |
#if>
- <#if (it.centanetNewPrice)?? || (it.centanetEsfPrice)??>
- ${it.centanetNewPrice!} |
- ${it.centanetEsfPrice!} |
+ <#if (it.zhongyuanNewPrice)?? || (it.zhongyuanEsfPrice)??>
+ ${it.zhongyuanNewPrice!} |
+ ${it.zhongyuanEsfPrice!} |
#if>
<#if (it.leyoujiaNewPrice)?? || (it.leyoujiaEsfPrice)??>
@@ -422,7 +435,15 @@
${it.yungujiaNewPrice!} |
${it.yungujiaEsfPrice!} |
#if>
-
+ <#if (it.jiwuNewPrice)?? || (it.jiwuEsfPrice)??>
+ ${it.jiwuNewPrice!} |
+ ${it.jiwuEsfPrice!} |
+ #if>
+ <#if (it.tsfhouseNewPrice)?? || (it.tsfhouseEsfPrice)??>
+ ${it.tsfhouseNewPrice!} |
+ ${it.tsfhouseEsfPrice!} |
+ #if>
+
#list>
<#if averageStatistics?size == 0>
diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AverageStatistics.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AverageStatistics.java
index fd659f31b..7b2405df1 100644
--- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AverageStatistics.java
+++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/AverageStatistics.java
@@ -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;
+ }
}
diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/AverageStatisticsServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/AverageStatisticsServiceImpl.java
index 687b1346f..772d5594c 100644
--- a/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/AverageStatisticsServiceImpl.java
+++ b/projects/fangjia-service/src/main/java/com/fangjia/service/mongo/fangjia/AverageStatisticsServiceImpl.java
@@ -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());
}
}
}