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 5961db2d8..ae7b0e7ec 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 @@ -133,7 +133,7 @@ public class CcbRentController { } public Object downloadPageAction(PropertyEvaluationModel result, HttpServletRequest request, @Param(name = "city") String city, @Param(name = "district") String districtStr, - @Param(name = "name") String name, @Param(name = "address") String address, + @Param(name = "name") String name, @Param(name = "address") String address, @Param(name = "addressDetail") String addressDetail, @Param(name = "size") Double size, @Param(name = "floor") Integer floor, @Param(name = "height") Integer height, @Param(name = "room") Integer room, @Param(name = "hall") Integer hall, @Param(name = "toilet") Integer toilet, @Param(name = "direction") String direction, @Param(name = "fitment") String fitment, @Param(name = "hasLift") String hasLift, @Param(name = "chartImgUrl") String chartImgUrl) { com.fangjia.open.model.PropertyEvaluationModel model = new com.fangjia.open.model.PropertyEvaluationModel(); @@ -214,6 +214,7 @@ public class CcbRentController { districtPriceMap.put("buildYear",district.getFinishBuildingDate()); districtPriceMap.put("hasLift",hasLift); districtPriceMap.put("room", room); + districtPriceMap.put("addressDetail", addressDetail); Integer startPrice = (int)(evaluation.getTotalPrice() - evaluation.getTotalPrice()*0.2); Integer endPrice = (int)(evaluation.getTotalPrice() + evaluation.getTotalPrice()*0.2); @@ -525,7 +526,7 @@ public class CcbRentController { } public void downloadAction(HttpServletResponse response, HttpServletRequest request, @Param(name = "city") String city, @Param(name = "district") String district, - @Param(name = "name") String name, @Param(name = "address") String address, + @Param(name = "name") String name, @Param(name = "address") String address, @Param(name = "addressDetail") String addressDetail, @Param(name = "size") Double size, @Param(name = "floor") Integer floor, @Param(name = "height") Integer height, @Param(name = "room") Integer room, @Param(name = "hall") Integer hall, @Param(name = "toilet") Integer toilet, @Param(name = "direction") String direction, @Param(name = "fitment") String fitment, @Param(name = "hasLift") String hasLift, @Param(name = "chartImgUrl") String chartImgUrl) throws IOException { response.setHeader("Content-disposition", "attachment; filename=" + URLEncoder.encode("×â½ð¹Àֵ±¨¸æ", "UTF-8") + ".pdf"); @@ -540,7 +541,7 @@ public class CcbRentController { fontResolver.addFont(fontUrl, BaseFont.IDENTITY_H, BaseFont.NOT_EMBEDDED); final String path = "http://" + request.getServerName() + ":" + request.getServerPort() + request.getContextPath(); String url = path + "/ccbRent/downloadPage?city=" + DataUtil.urlEncode(city) + "&district="+DataUtil.urlEncode(district)+"&name="+DataUtil.urlEncode(name); - url += "&address=" + DataUtil.urlEncode(address) +"&size="+size+"&floor="+floor+"&height="+height+"&room="+room+"&hall="+hall+"&toilet="+toilet+"&direction="+direction+"&fitment="+fitment+"&chartImgUrl="+chartImgUrl + "&hasLift=" + DataUtil.urlEncode(hasLift); + url += "&address=" + DataUtil.urlEncode(address) + "&addressDetail=" + DataUtil.urlEncode(addressDetail) +"&size="+size+"&floor="+floor+"&height="+height+"&room="+room+"&hall="+hall+"&toilet="+toilet+"&direction="+direction+"&fitment="+fitment+"&chartImgUrl="+chartImgUrl + "&hasLift=" + DataUtil.urlEncode(hasLift); renderer.setDocument(url); renderer.layout(); renderer.createPDF(os, true); diff --git a/projects/fangjia-open/src/main/webapp/ccbRent/detail.ftl b/projects/fangjia-open/src/main/webapp/ccbRent/detail.ftl index a122c9506..1f13a034f 100644 --- a/projects/fangjia-open/src/main/webapp/ccbRent/detail.ftl +++ b/projects/fangjia-open/src/main/webapp/ccbRent/detail.ftl @@ -97,7 +97,7 @@
4 房产状况
- 详细地址:
+ 详细地址:
楼盘名称:
室号:
朝向:
@@ -204,7 +204,7 @@ $.toast("报告下载中,请耐心等待"); $("#download").css('color', 'blue') let chartImgUrl = $('#chartImgUrl').val(); - window.location.href = "download?city="+params.city+"&district="+params.district+"&name="+params.name+"&address="+params.address+"&size="+params.size+"&floor="+params.floor + window.location.href = "download?city="+params.city+"&district="+params.district+"&name="+params.name+"&address="+params.address+"&addressDetail="+params.addressDetail+"&size="+params.size+"&floor="+params.floor +"&height="+params.height+"&room="+params.roomNumber+"&hall="+params.hall+"&toilet="+params.toilet+"&direction="+params.direction+"&fitment="+params.fitment+"&chartImgUrl=" + chartImgUrl + "&hasLift=" + (params.hasLift == 'true' ? '有' : '无'); }); @@ -223,7 +223,8 @@ 'direction': sessionStorage.direction, 'fitment': sessionStorage.fitment, 'hasLift': sessionStorage.hasLift, - 'roomNumber': sessionStorage.roomNumber + 'roomNumber': sessionStorage.roomNumber, + 'addressDetail': sessionStorage.addressDetail }; function init() { @@ -244,6 +245,7 @@ $('span[name="cal_date"]').text(result.cal_date) $('span[name="name"]').text(result.name); $('span[name="address"]').text(result.address); + $('span[name="addressDetail"]').text(params.addressDetail); $('span[name="totalPrice"]').text(result.totalPrice) $('span[name="totalPriceUpper"]').text(result.totalPriceUpper) diff --git a/projects/fangjia-open/src/main/webapp/ccbRent/downloadPage.ftl b/projects/fangjia-open/src/main/webapp/ccbRent/downloadPage.ftl index 6303c82f4..6584823f1 100644 --- a/projects/fangjia-open/src/main/webapp/ccbRent/downloadPage.ftl +++ b/projects/fangjia-open/src/main/webapp/ccbRent/downloadPage.ftl @@ -50,7 +50,7 @@ 楼盘名称 <#if result.name??>${result.name} 地址 - <#if result.address??>${result.address} + <#if result.addressDetail??>${result.addressDetail} 室号 diff --git a/projects/fangjia-open/src/main/webapp/ccbRent/index.ftl b/projects/fangjia-open/src/main/webapp/ccbRent/index.ftl index 5f4a59fce..7255e20f4 100644 --- a/projects/fangjia-open/src/main/webapp/ccbRent/index.ftl +++ b/projects/fangjia-open/src/main/webapp/ccbRent/index.ftl @@ -166,6 +166,7 @@ sessionStorage.name = $('input[name="name"]').val() sessionStorage.district = $('input[name="district"]').val() sessionStorage.address = $('input[name="address"]').val() + sessionStorage.addressDetail = $('input[name="address"]').val() sessionStorage.size = $('input[name="size"]').val() sessionStorage.roomNumber = $('input[name="roomNumber"]').val() sessionStorage.room = $('input[name="room"]').val()