diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/YugudanController.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/YugudanController.java index 37e2d93f7..3a51dcc61 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/YugudanController.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/controllers/YugudanController.java @@ -362,8 +362,8 @@ public class YugudanController { if (model.getId()>0) { //FjtEvaluation evaluation = fjtEvaluationService.findEvaluationById(model.getId()); Map data = new HashMap(); - if(StringUtils.isNotBlank(model.getAddress())){ - data.put("address", model.getAddress()); + if(StringUtils.isNotBlank(model.getCertificateAddress())){ + data.put("certificateAddress", model.getCertificateAddress()); } // if(model.getPeopleEditDate()!=null || model.getPeopleEditPrice()!=null){ // data.put("peopleEdit", 1); diff --git a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/YugudanModel.java b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/YugudanModel.java index d710efeed..10db294b2 100644 --- a/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/YugudanModel.java +++ b/projects/fangjia-bkoff/src/main/java/com/fangjia/bkoff/model/YugudanModel.java @@ -150,8 +150,10 @@ public class YugudanModel extends BaseModel{ private String reportNum; private Integer askPriceId;//È˹¤Ñ¯¼Ûid - - + + private String certificateAddress; + + public int getId() { return id; } @@ -861,7 +863,12 @@ public class YugudanModel extends BaseModel{ public void setUnitNum(String unitNum) { this.unitNum = unitNum; } - - - + + public String getCertificateAddress() { + return certificateAddress; + } + + public void setCertificateAddress(String certificateAddress) { + this.certificateAddress = certificateAddress; + } } diff --git a/projects/fangjia-bkoff/src/main/webapp/yugudan/editEval.ftl b/projects/fangjia-bkoff/src/main/webapp/yugudan/editEval.ftl index 53fd8f659..0d7cdf0e7 100644 --- a/projects/fangjia-bkoff/src/main/webapp/yugudan/editEval.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/yugudan/editEval.ftl @@ -241,10 +241,10 @@ - 物业地å�€ + 产è¯�地å�€ - ${(evaluation.address)!} - + <#if evaluation?? && evaluation.certificateAddress??>${(evaluation.certificateAddress)!}<#else>${(evaluation.address)!} + diff --git a/projects/fangjia-bkoff/src/main/webapp/yugudan/evallist.ftl b/projects/fangjia-bkoff/src/main/webapp/yugudan/evallist.ftl index 26c02dc4c..c2fa9b4a8 100644 --- a/projects/fangjia-bkoff/src/main/webapp/yugudan/evallist.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/yugudan/evallist.ftl @@ -68,7 +68,7 @@ 城市 区域 楼盘å��ç§° - 估价地å�€ + 产è¯�地å�€ å¸�å�· é�¢ç§¯ 总价 @@ -83,7 +83,7 @@ ${it.city} ${it.region!} ${it.districtName!} - ${it.address!}<#if it.houseNum??>${it.houseNum!}å�· + <#if it.certificateAddress??>${(it.certificateAddress)!}<#else>${(it.address)!}<#if it.houseNum??>${it.houseNum!}å�· <#if it.unitNum?? && it.unitNum?length gt 1>${it.unitNum!}å�•å…ƒ <#if it.buildType!=3 && it.buildType!=8 && it.buildType!=0> <#if it.floorDesc?? && it.floorDesc?length gt 1>${it.floorDesc!}层 diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/Loudong.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/Loudong.java index 712b5fc7d..596613062 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/Loudong.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/mongo/model/bkoff/Loudong.java @@ -83,6 +83,8 @@ public class Loudong implements MongoEntity { private Date modifyDate; /**»§Êý*/ private Integer households; + /**Ò»Ìݼ¸»§µÄ»§*/ + private Integer roomCount; /** ×ܽ¨ÖþÃæ»ý */ private Double totalAreas; /** ¿ªÅÌʱ¼ä */ @@ -402,4 +404,6 @@ public class Loudong implements MongoEntity { public void setNameInSeaweed(String nameInSeaweed) { this.nameInSeaweed = nameInSeaweed; } + + } 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 c5991df90..7b9f33c58 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 @@ -102,6 +102,7 @@ public class FjtEvaluation implements SqlEntity{ private String finishDateStr;//¿¢¹¤Ê±¼ä private String useType;//·¿ÎÝÓÃ; + private String certificateAddress; //²úÖ¤µØÖ· @GeneratedValue(strategy = GenerationType.AUTO) @Id @@ -750,6 +751,15 @@ public class FjtEvaluation implements SqlEntity{ this.useType = useType; } + @Column(name = "certificate_address") + public String getCertificateAddress() { + return certificateAddress; + } + + public void setCertificateAddress(String certificateAddress) { + this.certificateAddress = certificateAddress; + } + @Override public String toString() { return "FjtEvaluation{" +