From 7c29e5f2d16f7ce6446828bbe04415de11a0022a Mon Sep 17 00:00:00 2001 From: gaojuan Date: Wed, 31 May 2023 14:17:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=BF=E6=BA=90=E5=88=97=E8=A1=A8=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/webapp/seawater/houseList.ftl | 14 ++++ .../dal/seawater/dao/SeawaterDaoImpl.java | 25 +++++++ .../fangjia/dal/seawater/model/Seawater.java | 70 +++++++++++++++++++ 3 files changed, 109 insertions(+) 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; + } }