diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/FjtEvaluation.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/FjtEvaluation.java index 4b72f411c..90af3ec7e 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/FjtEvaluation.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/FjtEvaluation.java @@ -92,6 +92,8 @@ public class FjtEvaluation implements SqlEntity{ private String contact; private String reportNum; private Double carSiteArea; + + private Integer carSitePrice; // ³µλ¼Û private String source; private String accountChecker; private String floorDesc; //±ðÊû¥²ãÃèÊö @@ -783,6 +785,15 @@ public class FjtEvaluation implements SqlEntity{ this.loan = loan; } + @Column(name = "car_site_price") + public Integer getCarSitePrice() { + return carSitePrice; + } + + public void setCarSitePrice(Integer carSitePrice) { + this.carSitePrice = carSitePrice; + } + @Override public String toString() { return "FjtEvaluation{" + diff --git a/projects/fangjia-open/src/main/webapp/static/js/select.js b/projects/fangjia-open/src/main/webapp/static/js/select.js index 1202c4ad6..6adecdba3 100644 --- a/projects/fangjia-open/src/main/webapp/static/js/select.js +++ b/projects/fangjia-open/src/main/webapp/static/js/select.js @@ -66,41 +66,41 @@ $(document).on('click', '.create-actions01', function () { $.actions(groups); }); - -// 选择操作-房型-室 -$(document).on('click', '.create-actions01', function () { - var buttons1 = [ - { - text: '请选择室', - label: true - } - ]; - for (var i = 1; i < 6; i++) { - buttons1.push({ - text: i + '', - onClick: function () { - $("#room").val(this.text) - $(".create-actions01").empty().text(this.text).addClass("selected") - } - }) - } - buttons1.push({ - text: '>5', - onClick: function () { - $("#room").val("") - $(".create-actions01").empty().text(">5") - } - }) - - var buttons2 = [ - { - text: '取消', - bg: 'gray' - } - ]; - var groups = [buttons1, buttons2]; - $.actions(groups); -}); +// +// // 选择操作-房型-室 +// $(document).on('click', '.create-actions01', function () { +// var buttons1 = [ +// { +// text: '请选择室', +// label: true +// } +// ]; +// for (var i = 1; i < 6; i++) { +// buttons1.push({ +// text: i + '', +// onClick: function () { +// $("#room").val(this.text) +// $(".create-actions01").empty().text(this.text).addClass("selected") +// } +// }) +// } +// buttons1.push({ +// text: '>5', +// onClick: function () { +// $("#room").val("") +// $(".create-actions01").empty().text(">5") +// } +// }) +// +// var buttons2 = [ +// { +// text: '取消', +// bg: 'gray' +// } +// ]; +// var groups = [buttons1, buttons2]; +// $.actions(groups); +// }); // 选择操作-房型-号 $(document).on('click', '.create-actions02', function () { diff --git a/projects/fangjia-open/src/main/webapp/weiXinEvaluation/form.ftl b/projects/fangjia-open/src/main/webapp/weiXinEvaluation/form.ftl index dec6ff49f..f9bc96179 100644 --- a/projects/fangjia-open/src/main/webapp/weiXinEvaluation/form.ftl +++ b/projects/fangjia-open/src/main/webapp/weiXinEvaluation/form.ftl @@ -211,13 +211,33 @@ +<#--
-
- <#if role?? && role==16> -- - - <#if fjtEvaluation.onlyOne! == 1> - 是 - <#elseif fjtEvaluation.onlyOne! == 2> - 否 - <#else> - - - #if> - -
- #if> +<#if fjtEvaluation.carSitePrice??>${fjtEvaluation.carSitePrice!}万元<#else>-#if>
+ <#---
--> +<#-- <#if role?? && role==16>--> +<#----> +<#-- --> +<#-- --> +<#-- <#if fjtEvaluation.onlyOne! == 1>--> +<#-- 是--> +<#-- <#elseif fjtEvaluation.onlyOne! == 2>--> +<#-- 否--> +<#-- <#else>--> +<#-- - --> +<#-- #if>--> +<#-- --> +<#--
--> +<#-- #if> -->@@ -273,10 +274,7 @@
<#if fjtEvaluation.gardenArea??>${fjtEvaluation.gardenArea!?string('0.##')}平米<#else>-#if>
<#if fjtEvaluation.outerArea??>${fjtEvaluation.outerArea!?string('0.##')}平米<#else>-#if>
-<#if fjtEvaluation.carSiteArea??>${fjtEvaluation.carSiteArea!?string('0.##')}平米<#else>-#if>
- <#if fjtEvaluation.city! == "上海"> -${fjtEvaluation.loopLine!}
- #if> +<#if fjtEvaluation.carSiteArea??>${fjtEvaluation.carSiteArea!?string('0.##')}平米<#else>-#if>
@@ -326,20 +324,23 @@
<#if fjtEvaluation.basementArea??&&(fjtEvaluation.basementArea!>0)>${fjtEvaluation.basementArea!?string('0.##')}平米<#else>-#if>
<#if fjtEvaluation.basementArea??&&(fjtEvaluation.atticArea!>0)>${fjtEvaluation.atticArea!?string('0.##')}平米<#else>-#if>
-- - - <#if fjtEvaluation.carport! == 1> - 已租 - <#elseif fjtEvaluation.carport! == 3> - 已购 - <#elseif fjtEvaluation.carport! == 2> - 暂无 - <#else> - - - #if> - -
+ <#if fjtEvaluation.city! == "上海"> +${fjtEvaluation.loopLine!}
+ #if> + <#----> +<#-- --> +<#-- --> +<#-- <#if fjtEvaluation.carport! == 1>--> +<#-- 已租--> +<#-- <#elseif fjtEvaluation.carport! == 3>--> +<#-- 已购--> +<#-- <#elseif fjtEvaluation.carport! == 2>--> +<#-- 暂无--> +<#-- <#else>--> +<#-- ---> +<#-- #if>--> +<#-- --> +<#--
-->