优化详细地址展示
This commit is contained in:
+4
-3
@@ -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);
|
||||
|
||||
@@ -97,7 +97,7 @@
|
||||
<div>
|
||||
<div class="title1">4 房产状况</div>
|
||||
<div class="p">
|
||||
<b>详细地址</b>:<span name="address"></span><br/>
|
||||
<b>详细地址</b>:<span name="addressDetail"></span><br/>
|
||||
<b>楼盘名称</b>:<span name="name"></span><br/>
|
||||
<b>室号</b>:<span name="roomNumber"></span><br/>
|
||||
<b>朝向</b>:<span name="direction"></span><br/>
|
||||
@@ -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)
|
||||
|
||||
|
||||
@@ -50,7 +50,7 @@
|
||||
<td class="textTd" style="width: 15%;">楼盘名称</td>
|
||||
<td class="textRight1" style="width: 35%;"><#if result.name??>${result.name}</#if></td>
|
||||
<td class="textTd" style="width: 15%;">地址</td>
|
||||
<td class="textRight2" colspan="3" style="width: 35%;"><#if result.address??>${result.address}</#if></td>
|
||||
<td class="textRight2" colspan="3" style="width: 35%;"><#if result.addressDetail??>${result.addressDetail}</#if></td>
|
||||
</tr>
|
||||
<tr class="tdbg">
|
||||
<td class="textTd">室号</td>
|
||||
|
||||
@@ -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()
|
||||
|
||||
Reference in New Issue
Block a user