diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java index ad88092f8..4cd803a38 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/PropertyController.java @@ -2447,7 +2447,8 @@ public class PropertyController { evaluation.setRegion(model.getRegion()); evaluation.setDistrictName(model.getName()); evaluation.setDirection(DIRECTION.get(model.getDirection())); - evaluation.setFitment(EVALUATION_MODEL_FITMENT.get(FITMENT.get(model.getDecoration()))); + evaluation.setFitment(EVALUATION_MODEL_FITMENT.get(FITMENT.get(StringUtils.isNotBlank(model.getDecoration()) ? + model.getDecoration() : model.getFitment()))); evaluation.setNoise(NOISE.get(model.getNoise())); evaluation.setEstateType(PROPERTY_TYPES.get(model.getPropertyType())); evaluation.setSight(SIGHT.get(model.getView())); @@ -5066,7 +5067,7 @@ public class PropertyController { List allDistricts = districtService.findNearestDistrict(district, model.getRadius(), fields, Integer.MAX_VALUE); //°´Ìõ¼þ¹ýÂËÏàËÆСÇø Integer buildYear = null; - List districts = null; + List districts = new ArrayList(); if(StringUtils.isNotBlank(district.getFinishBuildingDate())){ buildYear = DistrictScoreUtil.parseStringToDate(district.getFinishBuildingDate()); if(buildYear!=null){ diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/CcbRentController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/CcbRentController.java index 4ed50cdc6..4932b1adf 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/CcbRentController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/CcbRentController.java @@ -198,7 +198,7 @@ public class CcbRentController { List allDistricts = districtService.findNearestDistrict(district, model.getRadius(), fields, Integer.MAX_VALUE); //°´Ìõ¼þ¹ýÂËÏàËÆСÇø Integer buildYear = null; - List districts = null; + List districts = new ArrayList(); if(StringUtils.isNotBlank(district.getFinishBuildingDate())){ buildYear = DistrictScoreUtil.parseStringToDate(district.getFinishBuildingDate()); if(buildYear!=null){ @@ -342,7 +342,8 @@ public class CcbRentController { evaluation.setRegion(model.getRegion()); evaluation.setDistrictName(model.getName()); evaluation.setDirection(DIRECTION.get(model.getDirection())); - evaluation.setFitment(EVALUATION_MODEL_FITMENT.get(FITMENT.get(model.getDecoration()))); + evaluation.setFitment(EVALUATION_MODEL_FITMENT.get(FITMENT.get(StringUtils.isNotBlank(model.getDecoration()) ? + model.getDecoration() : model.getFitment()))); evaluation.setAtticArea(model.getAtticSize()); evaluation.setTerraceArea(model.getOuterSize()); evaluation.setBasementArea(model.getBasementSize()); diff --git a/projects/fangjia-open/src/main/webapp/ccbRent/detail.ftl b/projects/fangjia-open/src/main/webapp/ccbRent/detail.ftl index 41e2a5fac..6f72eb5cf 100644 --- a/projects/fangjia-open/src/main/webapp/ccbRent/detail.ftl +++ b/projects/fangjia-open/src/main/webapp/ccbRent/detail.ftl @@ -102,7 +102,7 @@ 室号:
朝向:
建筑面积:平米
- 所在楼层: 层 总层数
+ 所在楼层: 层(共层)
电梯配套:
装修情况:
建筑年代:
@@ -220,11 +220,13 @@ 'hall': sessionStorage.hall, 'toilet': sessionStorage.toilet, 'direction': sessionStorage.direction, - 'fitment': sessionStorage.fitment + 'fitment': sessionStorage.fitment, + 'hasLift': sessionStorage.hasLift }; function init() { - + $('span[name="hasLift"]').text(params.hasLift == 'true' ? '有' : '无') + $.ajax({ // 注意需要加.. url: '../property/rentReport', @@ -232,7 +234,7 @@ dataType:"json", type:"post", success:function(data){ - + if(data.code == 200){ let result = data.result; // 评估时间 @@ -242,6 +244,15 @@ $('span[name="totalPrice"]').text(result.totalPrice) $('span[name="totalPriceUpper"]').text(result.totalPriceUpper) + // 房产状况 + $('span[name="room"]').text(result.room) + $('span[name="floor"]').text(result.floor) + $('span[name="buildYear"]').text(result.buildYear) + $('span[name="direction"]').text(result.direction) + $('span[name="size"]').text(result.size) + $('span[name="height"]').text(result.height) + $('span[name="fitment"]').text(result.fitment) + // 历史租金 var charts = {} // charts.series = [{ @@ -268,16 +279,6 @@ charts.xData = result.trends.times; // 横坐标值 createChartNow('districtRentTrendsChart', charts, true); } - - // 房产状况 - $('span[name="room"]').text(result.room) - $('span[name="direction"]').text(result.direction) - $('span[name="size"]').text(result.size) - $('span[name="floor"]').text(result.floor) - $('span[name="height"]').text(result.height) - $('span[name="hasLift"]').text(result.hasLift) - $('span[name="fitment"]').text(result.fitment) - $('span[name="buildYear"]').text(result.buildYear) // 已租房源 var trades = result.trades; diff --git a/projects/fangjia-open/src/main/webapp/ccbRent/downloadPage.ftl b/projects/fangjia-open/src/main/webapp/ccbRent/downloadPage.ftl index 5624cadf6..3f97da60c 100644 --- a/projects/fangjia-open/src/main/webapp/ccbRent/downloadPage.ftl +++ b/projects/fangjia-open/src/main/webapp/ccbRent/downloadPage.ftl @@ -59,7 +59,7 @@ 建筑面积 <#if result.size??>${result.size}平米 所在楼层 - <#if result.floor??>${result.floor} 层 <#if result.height??>${result.height}总层数 + <#if result.floor??>${result.floor} 层(共<#if result.height??>${result.height}层) 电梯配套 diff --git a/projects/fangjia-open/src/main/webapp/ccbRent/index.ftl b/projects/fangjia-open/src/main/webapp/ccbRent/index.ftl index dc38ddc38..64c1bca5a 100644 --- a/projects/fangjia-open/src/main/webapp/ccbRent/index.ftl +++ b/projects/fangjia-open/src/main/webapp/ccbRent/index.ftl @@ -122,8 +122,9 @@ @@ -172,6 +173,7 @@ sessionStorage.height = $('input[name="height"]').val() sessionStorage.direction = $('input[name="direction"]').val() sessionStorage.fitment = $('input[name="fitment"]').val() + sessionStorage.hasLift = $('input[name="hasLift"]').val() } function getSession() { if (sessionStorage.city != undefined) { @@ -305,6 +307,55 @@ $.actions(groups); }); + + // 选择操作-装修情况 + $(document).on('click', '.create-actions05-now', function () { + var buttons1 = [ + { + text: '请选择装修情况', + label: true + }, + { + text: '简装', + bold: true, + onClick: function () { + $("a.create-actions05-now").empty().text(this.text).addClass("selected") + $("#fitment").val("2") + } + }, + { + text: '毛坯', + onClick: function () { + $("a.create-actions05-now").empty().text(this.text).addClass("selected") + $("#fitment").val("1") + } + }, + { + text: '精装', + onClick: function () { + $("a.create-actions05-now").empty().text(this.text).addClass("selected") + $("#fitment").val("3") + } + }, + { + text: '豪装', + onClick: function () { + $("a.create-actions05-now").empty().text(this.text).addClass("selected") + $("#fitment").val("4") + } + } + ]; + var buttons2 = [ + { + text: '取消', + bg: 'gray' + } + ]; + var groups = [buttons1, buttons2]; + $.actions(groups); + }); + + // 选择操作-房型-号 $(document).on('click', '.create-actions02-now', function () { var buttons1 = [ @@ -378,7 +429,7 @@ text: '否', onClick: function () { $('#hasLift').val(false) - $("a.create-actions14").empty().text(this.text).addClass("selected") + $("a.create-actions14-now").empty().text(this.text).addClass("selected") } } ];