diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/util/DataUtil.java b/projects/fangjia-core/src/main/java/com/fangjia/core/util/DataUtil.java index e11cd2246..adfb2c7c8 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/util/DataUtil.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/util/DataUtil.java @@ -1847,6 +1847,9 @@ public class DataUtil { // // System.out.println(FourUpSixInto("258.393", 2)); + String href = encodePicUrl("62afd81d303c3f827833bb03", "o", "upload"); + String link = "http://static.fangjia.com/stc/fs/"+href; + System.out.println(link); } } diff --git a/projects/fangjia-coresite/src/main/webapp/evaluation/evalResult.ftl b/projects/fangjia-coresite/src/main/webapp/evaluation/evalResult.ftl index 425df6501..0c828feec 100644 --- a/projects/fangjia-coresite/src/main/webapp/evaluation/evalResult.ftl +++ b/projects/fangjia-coresite/src/main/webapp/evaluation/evalResult.ftl @@ -182,10 +182,10 @@ -
-


更多次的评估,更好的体验

- -
+<#--
--> +<#--


更多次的评估,更好的体验

--> +<#-- --> +<#--
--> 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 41941514a..4b72f411c 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 @@ -105,6 +105,7 @@ public class FjtEvaluation implements SqlEntity{ private String certificateAddress; //²ú֤µØַ private Date downPdfDate;//ÏÂÔر¨¸æʱ¼ä + private Integer loan ;//ÊǷñÐø´û 1:ÊÇ 0:·ñ @GeneratedValue(strategy = GenerationType.AUTO) @Id @@ -773,6 +774,15 @@ public class FjtEvaluation implements SqlEntity{ this.downPdfDate = downPdfDate; } + @Column(name = "loan") + public Integer getLoan() { + return loan; + } + + public void setLoan(Integer loan) { + this.loan = loan; + } + @Override public String toString() { return "FjtEvaluation{" + diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/ReportFileAttach.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/ReportFileAttach.java index a22ef8332..acc9fcd36 100644 --- a/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/ReportFileAttach.java +++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/ReportFileAttach.java @@ -11,7 +11,7 @@ public class ReportFileAttach implements SqlEntity { private Integer userId; private Integer evaluationId; private String queryId; - private Integer fileClass; + private Integer fileClass;//1:ѯ¼۵¥ 2:²ú֤ 3:·¿ÎÝÕÕƬ 4:ÆäËü¸½¼þ 5:²úµ÷±¨¸æ»òȨ¼® private String fileName; private String fileId; 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 272979fca..587b3888d 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 @@ -918,6 +918,19 @@ public class WeiXinEvaluationController { return jsonMmodel; } + public Object saveBhLoanAction(EvaluationModel model){ + JsonModel jsonMmodel = new JsonModel(); + if(StringUtils.isNotBlank(model.getEvaluationId())){ + FjtEvaluation fjtEvaluation = fjtEvaluationService.findEvaluationById(Long.valueOf(model.getEvaluationId())); + if(fjtEvaluation != null && fjtEvaluation.getLoan()!=model.getLoan()){ + fjtEvaluation.setLoan(model.getLoan()); + fjtEvaluation.setLastUpdated(new Date()); + fjtEvaluationService.updateEvaluation(fjtEvaluation); + } + } + return jsonMmodel; + } + //ˢÐÂÉóº˼Û public Object refreshAuditPriceAction(EvaluationModel model){ JsonModel jsonMmodel = new JsonModel(); @@ -1106,9 +1119,15 @@ public class WeiXinEvaluationController { public Object checkImageAction(EvaluationModel model){ JsonModel jsonModel = new JsonModel(); if (StringUtils.isNotBlank(model.getEvaluationId())){ - List datas = reportFileAttachService.findHouseImage(Integer.valueOf(model.getEvaluationId()), 3); + List datas3 = reportFileAttachService.findHouseImage(Integer.valueOf(model.getEvaluationId()), 3); Map data = new HashMap(); - data.put("count", datas.size()); + data.put("count_3", datas3.size()); + + FjtEvaluation evaluation = fjtEvaluationService.findEvaluationById(Long.valueOf(model.getEvaluationId())); + if(evaluation!=null && evaluation.getLoan()!=null && evaluation.getLoan()==1){ + List datas5 = reportFileAttachService.findHouseImage(Integer.valueOf(model.getEvaluationId()), 5); + data.put("count_5", datas5.size()); + } jsonModel.setJsonModel(data); } return jsonModel; @@ -1287,7 +1306,7 @@ public class WeiXinEvaluationController { FjtUsers fjtUser = fjtUsersService.findById(Long.valueOf(userId)); UsersDetail usersDetail = usersDetailService.findById(fjtUser.getId()); try { - String id = new ObjectId().toString(); + List uploadfiles = new ArrayList(); for (CommonsMultipartFile file : files) { if (file.getSize() == 0 ) { @@ -1319,6 +1338,8 @@ public class WeiXinEvaluationController { } catch (IOException e) { //´¦ÀíÒ쳣ÐÅϢ } + String id = new ObjectId().toString(); + reportFileAttach = new ReportFileAttach(); reportFileAttach.setEvaluationId(Integer.valueOf(model.getEvaluationId())); reportFileAttach.setQueryId(model.getQueryId()); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/weixin/EvaluationModel.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/weixin/EvaluationModel.java index 8de0977f8..20f093053 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/weixin/EvaluationModel.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/weixin/EvaluationModel.java @@ -45,6 +45,7 @@ public class EvaluationModel extends BaseModel{ private Map loanInfoMap; private Integer hopePrice; private String remark; + private Integer loan; // private String preCode;//²³º£½ӿÚ--¥Å̱àÂë // private String preName;//²³º£½ӿÚ--¥ÅÌÃû³Æ // private String countryCode;//²³º£½ӿÚ--ÇøÓò±àÂë @@ -317,4 +318,12 @@ public class EvaluationModel extends BaseModel{ public void setAddress(String address) { this.address = address; } + + public Integer getLoan() { + return loan; + } + + public void setLoan(Integer loan) { + this.loan = loan; + } } diff --git a/projects/fangjia-open/src/main/webapp/static/js/report.js b/projects/fangjia-open/src/main/webapp/static/js/report.js index 92ef631b5..b61a6e2d1 100644 --- a/projects/fangjia-open/src/main/webapp/static/js/report.js +++ b/projects/fangjia-open/src/main/webapp/static/js/report.js @@ -190,6 +190,36 @@ $('#submitRemark').on('click', function () { } }); +$('#submitLoan').on('click', function () { + var opt = $("#submitLoan").text(); + if(opt == "修改"){ + $(this).parent().find("span").eq(1).hide() + $("input[name=loan]").removeClass("dn"); + $("#submitLoan").text("保存"); + }else{ + var loan = $("input[name=loan]").val(); + if(loan == ""){ + $.toast("请输入是否续贷"); + }else{ + $.ajax({ + url:"saveBhLoan", + data:{ + evaluationId:eId, + loan:loan + }, + dataType:"json", + success:function(data){ + $("#submitLoan").remove(); + $("input[name=loan]").remove(); + $("#refreshPrice0").show(); + location.href ="bhreport?evaluationId="+eId; + } + }) + } + } +}); + + $('#refreshPrice,#refreshPrice0').on('click', function () { $.ajax({ url:"refreshAuditPrice", @@ -301,21 +331,34 @@ $('.download_btn').on('click', function () { /* 下载评估报告 */ $('.formal_btn').on('click', function () { - $.ajax({ - url:"checkImage", - data:{ - evaluationId:eId - }, - dataType:"json", - success:function(data){ - if(data && data.count>0){ - clickFormalReport() - }else{ - $.alert('请上传房屋照片!'); + if(isLoan!=null) { + $.ajax({ + url:"checkImage", + data:{ + evaluationId:eId + }, + dataType:"json", + success:function(data){ + if(isLoan==1){ + if(data.count_5==0){ + $.alert('请上传产调报告或权籍!'); + }else if(data.count_3==0){ + $.alert('请上传房屋照片!'); + }else{ + clickFormalReport() + } + }else{ + if(data.count_3==0){ + $.alert('请上传房屋照片!'); + }else{ + clickFormalReport() + } + } } - } - }) - + }) + }else{ + $.alert('请选择是否续贷!'); + } }); function clickFormalReport(){ diff --git a/projects/fangjia-open/src/main/webapp/static/style/wx.css b/projects/fangjia-open/src/main/webapp/static/style/wx.css index 269a1a00e..0e85e8a93 100644 --- a/projects/fangjia-open/src/main/webapp/static/style/wx.css +++ b/projects/fangjia-open/src/main/webapp/static/style/wx.css @@ -134,7 +134,7 @@ input::-webkit-input-placeholder{ .inputTopic01{margin-bottom:-1px;} .inputTopic01 .topicTitle,.inputTopic02 .topicTitle{margin-right:0;border:none;line-height:2.5rem;} .inputTopic01 .topicTitle .input_price{width:20%;padding-left:5px;} -.inputTopic02 .topicTitle .input_lender{width:40%;padding-left:5px;} +.inputTopic02 .topicTitle .input_lender{width:39%;padding-left:5px;line-height: 28px;} .inputTopic02 .topicTitle .input_cardId{width:35%;padding-left:5px;} .submit_btn{width:90px;border-left:solid 1px #e7e7e7;float:right;padding-right:0;text-align:center;cursor:pointer;} .left01{float:left;margin-right:8%;} diff --git a/projects/fangjia-open/src/main/webapp/weiXinEvaluation/bhreport.ftl b/projects/fangjia-open/src/main/webapp/weiXinEvaluation/bhreport.ftl index 165012ff6..f16637105 100644 --- a/projects/fangjia-open/src/main/webapp/weiXinEvaluation/bhreport.ftl +++ b/projects/fangjia-open/src/main/webapp/weiXinEvaluation/bhreport.ftl @@ -132,6 +132,18 @@ + +
@@ -139,7 +151,7 @@ <#if reportFileMap??>
已上传文件: - <#if reportFileMap["1"]??>询价单(${reportFileMap["1"]?size}) + <#if reportFileMap["5"]??>产调报告或权籍(${reportFileMap["5"]?size}) <#if reportFileMap["2"]??> <#if reportFileMap["3"]??> <#if reportFileMap["4"]??> @@ -456,6 +468,10 @@