From 8c8543535a536e5029ba6d50275629d9509cbd29 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Tue, 16 May 2023 18:45:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=AD=97=E6=AE=B5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bkoff/controllers/DataController.java | 25 ++++++++++++++++--- .../src/main/webapp/district/add.ftl | 7 +++--- .../src/main/webapp/district/edit.ftl | 8 +++--- .../dal/mongo/model/bkoff/CityInfo.java | 10 ++++++++ 4 files changed, 39 insertions(+), 11 deletions(-) diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DataController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DataController.java index bef3b773e..e0abb6dd5 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DataController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/DataController.java @@ -769,6 +769,7 @@ public class DataController { outfields.add("districtsHasLoudong"); outfields.add("districtsHasFanghao"); outfields.add("priceCoverage"); + outfields.add("districtAliasTotalCount"); outfields.add("priceCreditGte80Coverage"); outfields.add("priceCreditGte66Coverage"); outfields.add("priceCreditGte60Coverage"); @@ -801,6 +802,7 @@ public class DataController { map.put("districtsHasLoudong", cityInfo.getDistrictsHasLoudong() == null ? 0 : cityInfo.getDistrictsHasLoudong()); map.put("districtsHasFanghao", cityInfo.getDistrictsHasFanghao() == null ? 0 : cityInfo.getDistrictsHasFanghao()); map.put("priceCoverage", cityInfo.getPriceCoverage()); + map.put("districtAliasTotalCount", cityInfo.getDistrictAliasTotalCount) map.put("priceCreditGte80Coverage", cityInfo.getPriceCreditGte80Coverage()); map.put("priceCreditGte66Coverage", cityInfo.getPriceCreditGte66Coverage()); map.put("priceCreditGte60Coverage", cityInfo.getPriceCreditGte60Coverage()); @@ -921,7 +923,8 @@ public class DataController { put( "estateCompany" , "物业公司" ); put( "cubagePercent" , "容积率" ); put( "virescencePercent" , "绿化率" ); - put( "carSite" , "停车位" ); + put( "carSite" , "停车位" ); + put( "carSiteCount" , "停车位描述" ); put( "estateCharge" , "物业费" ); put( "floorplanPics" , "楼层平面图" ); put( "outPics" , "外景图" ); @@ -949,7 +952,6 @@ public class DataController { put( "liveDate","开业时间"); put( "divisible","是否可分割"); put( "unifiedManage","是否统一管理"); - put( "carSiteCount","车位数量"); put( "metroInfo","地铁沿线"); put( "metroNames","地铁站名"); put( "facilities","配套设施"); @@ -996,7 +998,24 @@ public class DataController { put("committee","居委会"); put("schools","对口学校"); put("houseStructure","房屋结构"); - } };// + put("estateType2","物业类型"); + put("buildDate","建筑年代"); + put("alias","别名"); + put("addrAlias","地址别名"); + put("mainTypeArea","主力面积"); + put("loudongCount","楼栋数"); + put("township","乡镇街道"); + put("schools","对口小学"); + put("kindergartens","对口幼儿园"); + put("elevator","电梯"); + put("landProperty","权属类别"); + put("usageCard","土地使用权证号"); + put("landUsageStart","土地使用年限"); + put("occupancyRate","入住率"); + put("mainType","主力户型"); + put("mappingAlias","映射别名"); + put("districtAliasTotalCount", "别名总量"); + } };// return map; } diff --git a/projects/fangjia-bkoff/src/main/webapp/district/add.ftl b/projects/fangjia-bkoff/src/main/webapp/district/add.ftl index e7c1e520b..1a3f7a7cd 100644 --- a/projects/fangjia-bkoff/src/main/webapp/district/add.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/district/add.ftl @@ -257,10 +257,9 @@ checked> 灏忛珮灞�   checked> 楂樺眰   checked> 瓒呴珮灞�   - checked> 鐙爧   - checked> 鍙屾嫾   - checked> 鑱旀帓   - checked> 鍙犲姞   + checked> SOHO   + checked> LOFT   + checked> 閰掑簵寮忓叕瀵�   diff --git a/projects/fangjia-bkoff/src/main/webapp/district/edit.ftl b/projects/fangjia-bkoff/src/main/webapp/district/edit.ftl index b856169b2..9c9421494 100644 --- a/projects/fangjia-bkoff/src/main/webapp/district/edit.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/district/edit.ftl @@ -314,15 +314,15 @@ checked> 鍙犲姞   checked> 鑰佸紡鍒娲嬫埧   +
checked > 澶氬眰   checked> 灏忛珮灞�   checked> 楂樺眰   checked> 瓒呴珮灞�   - checked> 鐙爧   - checked> 鍙屾嫾   - checked> 鑱旀帓   - checked> 鍙犲姞   + checked> SOHO + checked> LOFT   + checked> 閰掑簵寮忓叕瀵�  
diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/CityInfo.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/CityInfo.java index 235e3a2ee..0270b441c 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/CityInfo.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/CityInfo.java @@ -51,6 +51,7 @@ public class CityInfo implements MongoEntity { private Double priceCreditGte66Coverage; private Double priceCreditGte60Coverage; private Double priceCreditGte00Coverage; + private Integer districtAliasTotalCount; @Id @GeneratedValue @@ -378,4 +379,13 @@ public class CityInfo implements MongoEntity { public void setPriceCreditGte00Coverage(Double priceCreditGte00Coverage) { this.priceCreditGte00Coverage = priceCreditGte00Coverage; } + + @Column(name = "district_alias_total_count") + public Integer getDistrictAliasTotalCount() { + return districtAliasTotalCount; + } + + public void setDistrictAliasTotalCount(Integer districtAliasTotalCount) { + this.districtAliasTotalCount = districtAliasTotalCount; + } }