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 37b785212..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())); @@ -5047,7 +5048,7 @@ public class PropertyController { districtPriceMap.put("name", district.getName()); districtPriceMap.put("address", district.getAddress()); districtPriceMap.put("totalPrice", evaluation.getTotalPrice()); - districtPriceMap.put("totalPriceUpper", CNNMFilter.convert(String.valueOf(evaluation.getTotalPrice()))); + districtPriceMap.put("totalPriceUpper", CurrencyConverter.toChinese(String.valueOf(evaluation.getTotalPrice()))); districtPriceMap.put("cal_date", DateUtil.formatByPattern(new Date(), "yyyy/MM/dd")); districtPriceMap.put("direction", evaluation.getDirection()); districtPriceMap.put("size", evaluation.getArea()); @@ -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 38e9056f1..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 @@ -179,7 +179,7 @@ public class CcbRentController { districtPriceMap.put("name", district.getName()); districtPriceMap.put("address", district.getAddress()); districtPriceMap.put("totalPrice", evaluation.getTotalPrice()); - districtPriceMap.put("totalPriceUpper", CNNMFilter.convert(String.valueOf(evaluation.getTotalPrice()))); + districtPriceMap.put("totalPriceUpper", CurrencyConverter.toChinese(String.valueOf(evaluation.getTotalPrice()))); districtPriceMap.put("cal_date", DateUtil.formatByPattern(new Date(), "yyyy/MM/dd")); districtPriceMap.put("direction", evaluation.getDirection()); districtPriceMap.put("size", evaluation.getArea()); @@ -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 b896cb481..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 @@ 室号:
朝向:
建筑面积:平米
- 所在楼层: 层 总层数
+ 所在楼层: 层(共层)
电梯配套:
装修情况:
建筑年代:
@@ -198,62 +198,13 @@ -<#-- --> -<#-- --> -<#-- --> -<#-- --> -<#-- --> -<#-- -->