diff --git a/projects/fangjia-bkoff/src/main/webapp/seawater/houseList.ftl b/projects/fangjia-bkoff/src/main/webapp/seawater/houseList.ftl
index 38771bc5d..6955b465c 100644
--- a/projects/fangjia-bkoff/src/main/webapp/seawater/houseList.ftl
+++ b/projects/fangjia-bkoff/src/main/webapp/seawater/houseList.ftl
@@ -158,6 +158,13 @@
�� |
装修 |
�� |
+ 梯 |
+ 户 |
+ 户型结构 |
+ 交易�属 |
+ 房�所属 |
+<#-- 房屋年� | -->
+ �备电梯 |
物业类型 |
�� |
状� |
@@ -200,6 +207,13 @@
${it.block!} |
${it.fitment!} |
${it.direction!} |
+ ${it.lift!} |
+ ${it.liftHousehold!} |
+ ${it.roomStructure!} |
+ ${it.tradeProperty!} |
+ ${it.propertyOwnership!} |
+<#-- ${it.housingAge!} | -->
+ ${it.elevator!} |
${it.estateType!} |
<#if it.url??>
diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDaoImpl.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDaoImpl.java
index adb32083b..ab018c2ac 100644
--- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDaoImpl.java
+++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/dao/SeawaterDaoImpl.java
@@ -347,6 +347,31 @@ public class SeawaterDaoImpl extends com.fangjia.dal.SeawaterDaoImpl i
if(source.containsKey("status")){
seawater.setStatus(source.getInt("status"));
}
+
+ if(source.containsKey("lift")){
+ seawater.setLift(source.getInt("lift"));
+ }
+
+ if(source.containsKey("lift_household")){
+ seawater.setLiftHousehold(source.getInt("lift_household"));
+ }
+
+ if(source.containsKey("room_structure")){
+ seawater.setRoomStructure(source.getString("room_structure"));
+ }
+
+ if(source.containsKey("trade_property")){
+ seawater.setTradeProperty(source.getString("trade_property"));
+ }
+ if(source.containsKey("property_ownership")){
+ seawater.setPropertyOwnership(source.getString("property_ownership"));
+ }
+ if(source.containsKey("housing_age")){
+ seawater.setHousingAge(source.getString("housing_age"));
+ }
+ if(source.containsKey("elevator")){
+ seawater.setElevator(source.getString("elevator"));
+ }
seawaterList.add(seawater);
}
return seawaterList;
diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/model/Seawater.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/model/Seawater.java
index 1af563193..15176face 100644
--- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/model/Seawater.java
+++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/seawater/model/Seawater.java
@@ -62,6 +62,13 @@ public class Seawater implements SeawaterEntity {
private String purpose;
private String estateType;
private String buildType;
+ private Integer lift;
+ private Integer liftHousehold;
+ private String roomStructure;//»§Ðͽṹ
+ private String tradeProperty; //½»Ò×ȨÊô
+ private String propertyOwnership; //·¿È¨ËùÊô ·Ç¹²ÓÐ
+ private String housingAge; //·¿ÎÝÄêÏÞ Âú¶þÄê
+ private String elevator; //Å䱸µçÌÝ ÓÐ/ÎÞ
@Id
@Column(name = "_id")
@@ -325,4 +332,67 @@ public class Seawater implements SeawaterEntity {
public void setBuildType(String buildType) {
this.buildType = buildType;
}
+
+ @Column(name = "lift")
+ public Integer getLift() {
+ return lift;
+ }
+
+ public void setLift(Integer lift) {
+ this.lift = lift;
+ }
+
+ @Column(name = "lift_household")
+ public Integer getLiftHousehold() {
+ return liftHousehold;
+ }
+
+ public void setLiftHousehold(Integer liftHousehold) {
+ this.liftHousehold = liftHousehold;
+ }
+
+ @Column(name = "room_structure")
+ public String getRoomStructure() {
+ return roomStructure;
+ }
+
+ public void setRoomStructure(String roomStructure) {
+ this.roomStructure = roomStructure;
+ }
+
+ @Column(name = "trade_property")
+ public String getTradeProperty() {
+ return tradeProperty;
+ }
+
+ public void setTradeProperty(String tradeProperty) {
+ this.tradeProperty = tradeProperty;
+ }
+
+ @Column(name = "property_ownership")
+ public String getPropertyOwnership() {
+ return propertyOwnership;
+ }
+
+ public void setPropertyOwnership(String propertyOwnership) {
+ this.propertyOwnership = propertyOwnership;
+ }
+
+ @Column(name = "housing_age")
+ public String getHousingAge() {
+ return housingAge;
+ }
+
+ public void setHousingAge(String housingAge) {
+ this.housingAge = housingAge;
+ }
+
+ @Column(name = "elevator")
+ public String getElevator() {
+ return elevator;
+ }
+
+ public void setElevator(String elevator) {
+ this.elevator = elevator;
+ }
}
|