Merge branch 'open_gj' into 'master'

评估放渤海地址搜索后面

See merge request !189
This commit is contained in:
2021-11-16 11:04:42 +08:00
2 changed files with 8 additions and 3 deletions
@@ -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<String, String> data = new HashMap<String, String>();
@@ -34,7 +34,7 @@
<div class="topic">
<div class="topicContent topicTop" style="padding:0px 20px;">
<p>${fjtEvaluation.districtName!}</p>
<p style="margin-top:-4px;"><i class="location"></i><small>${fjtEvaluation.address!} <#if fjtEvaluation.houseNum?? && (fjtEvaluation.houseNum?contains("栋") || fjtEvaluation.houseNum?contains("幢"))>${fjtEvaluation.houseNum!}<#else>${fjtEvaluation.houseNum!}号</#if>${fjtEvaluation.roomNum!}室</small> <a href="../district/weXinList?cityName=${fjtEvaluation.city!}" class="collectionLink" style="line-height: 32px;">重新评估&nbsp;></a></p>
<p style="margin-top:-4px;"><i class="location"></i><small>${fjtEvaluation.address!} <#if fjtEvaluation.houseNum?? && fjtEvaluation.houseNum?contains("号")>${fjtEvaluation.houseNum!}<#else>${fjtEvaluation.houseNum!}号</#if>${fjtEvaluation.roomNum!}室</small> <a href="../district/weXinList?cityName=${fjtEvaluation.city!}" class="collectionLink" style="line-height: 32px;">重新评估&nbsp;></a></p>
<p style="color: #F4A460;font-size: 12px;line-height: 20px;margin-top: -5px;margin-left: 20px;">*请确认与产证地址一致</p>
<span></span>
<#if bohaiEvaluationAudit?? && bohaiEvaluationAudit.auditStatus!=0>