From 106fa1195c31da87d6095869fe3723bd11684a7b Mon Sep 17 00:00:00 2001 From: gaojuan Date: Tue, 16 Nov 2021 12:01:22 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=94=BE=E6=B8=A4=E6=B5=B7?= =?UTF-8?q?=E5=9C=B0=E5=9D=80=E6=90=9C=E7=B4=A2=E5=90=8E=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controllers/weixin/WeiXinEvaluationController.java | 9 +++++++-- .../src/main/webapp/weiXinEvaluation/bhreport.ftl | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/WeiXinEvaluationController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/WeiXinEvaluationController.java index d027955f8..8501d113e 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/WeiXinEvaluationController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/weixin/WeiXinEvaluationController.java @@ -446,8 +446,7 @@ public class WeiXinEvaluationController { evaluation.setAveragePrice((int)(totalPrice/evaluation.getHouseArea())); } - fjtEvaluationService.saveEvaluation(evaluation); - System.out.println("保存评估记录成功 "+evaluation.getDistrictName()); + if(fjtUser!=null && fjtUser.getRole()==17) { System.out.println("渤海地址搜索 "+evaluation.getAddress()); @@ -511,7 +510,13 @@ public class WeiXinEvaluationController { audit.setDateCreated(new Date()); audit.setDateCreated(new Date()); bohaiEvaluationAuditService.saveBohaiEvaluationAudit(audit); + + fjtEvaluationService.saveEvaluation(evaluation); + System.out.println("保存评估记录成功 "+evaluation.getDistrictName()); } + }else{ + fjtEvaluationService.saveEvaluation(evaluation); + System.out.println("保存评估记录成功 "+evaluation.getDistrictName()); } Map data = new HashMap(); diff --git a/projects/fangjia-open/src/main/webapp/weiXinEvaluation/bhreport.ftl b/projects/fangjia-open/src/main/webapp/weiXinEvaluation/bhreport.ftl index 00c72b221..655e4edd5 100644 --- a/projects/fangjia-open/src/main/webapp/weiXinEvaluation/bhreport.ftl +++ b/projects/fangjia-open/src/main/webapp/weiXinEvaluation/bhreport.ftl @@ -34,7 +34,7 @@

${fjtEvaluation.districtName!}

-

${fjtEvaluation.address!} <#if fjtEvaluation.houseNum?? && (fjtEvaluation.houseNum?contains("鏍�") || fjtEvaluation.houseNum?contains("骞�"))>${fjtEvaluation.houseNum!}<#else>${fjtEvaluation.houseNum!}鍙�${fjtEvaluation.roomNum!}瀹� 閲嶆柊璇勪及 >

+

${fjtEvaluation.address!} <#if fjtEvaluation.houseNum?? && fjtEvaluation.houseNum?contains("鍙�")>${fjtEvaluation.houseNum!}<#else>${fjtEvaluation.houseNum!}鍙�${fjtEvaluation.roomNum!}瀹� 閲嶆柊璇勪及 >

*璇风‘璁や笌浜ц瘉鍦板潃涓�鑷�

<#if bohaiEvaluationAudit?? && bohaiEvaluationAudit.auditStatus!=0>