From c87bb7cf27edb3c013fb1a5aa7bac8e7e50e8361 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Wed, 30 Nov 2022 14:27:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B8=A4=E6=B5=B7=E5=9C=B0=E5=9D=80=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E8=87=AA=E5=B7=B1=E8=BE=93=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../weixin/WeiXinEvaluationController.java | 21 +++++++++++-------- .../src/main/webapp/static/js/select.js | 5 ++--- .../main/webapp/weiXinEvaluation/bhform.ftl | 14 ++++++++----- .../main/webapp/weiXinEvaluation/bhreport.ftl | 2 +- 4 files changed, 24 insertions(+), 18 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 3a03aa8d1..800a2360d 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 @@ -454,9 +454,7 @@ public class WeiXinEvaluationController { evaluation.setCity(district.getCity()); evaluation.setRegion(district.getRegion()); evaluation.setDistrictName(district.getName()); - if(StringUtils.isBlank(evaluation.getAddress())){ - evaluation.setAddress(district.getAddress()); - } + evaluation.setAddress(district.getAddress()); evaluation.setUserId(userId); evaluation.setDateCreated(new Date()); evaluation.setLastUpdated(new Date()); @@ -491,8 +489,8 @@ public class WeiXinEvaluationController { if(fjtUser!=null && fjtUser.getRole()==17) { - System.out.println("渤海地址搜索 "+evaluation.getAddress()); - List bhDists = BHBankUtils.getDistrictByBhbank(evaluation.getAddress()); + System.out.println("渤海地址搜索 "+evaluation.getCertificateAddress()); + List bhDists = BHBankUtils.getDistrictByBhbank(evaluation.getCertificateAddress()); JSONObject o = null; if(bhDists.size()==0){ bhDists = BHBankUtils.getDistrictByBhbank(district.getName()); @@ -545,7 +543,7 @@ public class WeiXinEvaluationController { if(StringUtils.isBlank(usersDetail.getMobile())){ usersDetail.setMobile(fjtUser.getEmail()); } - System.out.println("渤海询价搜索 "+evaluation.getAddress()); + System.out.println("渤海询价搜索 "+evaluation.getCertificateAddress()); JSONObject bhApiResult = BHBankUtils.getInquirePrice(model, bhMatchMap, usersDetail, evaluation.getTotalPrice()); if(bhApiResult!=null && (Integer)bhApiResult.get("errCode")==0){ System.out.println("渤海询价搜索结果 "+bhApiResult.toString()); @@ -1411,11 +1409,16 @@ public class WeiXinEvaluationController { } if(uploadfiles.size()>0){ JSONObject jsonObj = BHBankUtils.inquireUploadFiles2(usersDetail.getName(),model.getQueryId(), model.getFileClass(), uploadfiles); - if(jsonObj!=null && (Integer)jsonObj.get("errCode")!=0) { - mav.setModel(BasicModel.buildServerErrorModel().setMsg((String) jsonObj.get("errMsg"))); + if(jsonObj!=null){ + if(jsonObj!=null && (Integer)jsonObj.get("errCode")!=0) { + mav.setModel(BasicModel.buildServerErrorModel().setMsg((String) jsonObj.get("errMsg"))); + }else{ + mav.setModel(BasicModel.buildServerErrorModel().setMsg(("文件上传成功!"))); + } }else{ - mav.setModel(BasicModel.buildServerErrorModel().setMsg(("文件上传成功!"))); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("上传失败!")); } + } } catch (Exception e) { e.printStackTrace(); 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 b7c01d2f6..1202c4ad6 100644 --- a/projects/fangjia-open/src/main/webapp/static/js/select.js +++ b/projects/fangjia-open/src/main/webapp/static/js/select.js @@ -1,9 +1,7 @@ // JavaScript Document - /* 閫夋嫨鎿嶄綔 */ - // 閫夋嫨鎿嶄綔-鍦板潃 -$(document).on('click', '.create-actions00', function () { +/*$(document).on('click', '.create-actions00', function () { var buttons1 = [ { text: '璇烽�夋嫨鍦板潃', @@ -31,6 +29,7 @@ $(document).on('click', '.create-actions00', function () { var groups = [buttons1, buttons2]; $.actions(groups); }); + */ // 閫夋嫨鎿嶄綔-鎴垮瀷-瀹� $(document).on('click', '.create-actions01', function () { diff --git a/projects/fangjia-open/src/main/webapp/weiXinEvaluation/bhform.ftl b/projects/fangjia-open/src/main/webapp/weiXinEvaluation/bhform.ftl index 68519a79b..5160cbd1a 100644 --- a/projects/fangjia-open/src/main/webapp/weiXinEvaluation/bhform.ftl +++ b/projects/fangjia-open/src/main/webapp/weiXinEvaluation/bhform.ftl @@ -47,13 +47,17 @@
  • -
    -
    -
    鍦板潃锛�
    - -

    璇烽�夋嫨鍦板潃

    +
    浜ц瘉鍦板潃锛�
    +
    +
    +<#--
    --> +<#--
    鍦板潃锛�
    --> +<#-- --> +<#--

    璇烽�夋嫨鍦板潃

    --> +<#--
    -->
    锛堝繀濉」锛�
    diff --git a/projects/fangjia-open/src/main/webapp/weiXinEvaluation/bhreport.ftl b/projects/fangjia-open/src/main/webapp/weiXinEvaluation/bhreport.ftl index 6c6e97d28..a64bb2f90 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!}<#else>${fjtEvaluation.houseNum!}鍙�${fjtEvaluation.roomNum!}瀹� 閲嶆柊璇勪及 >

    +

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

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

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