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 4aaabb88f..608508eaa 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 @@ -1845,7 +1845,7 @@ public class DataUtil { // // System.out.println(FourUpSixInto("258.393", 2)); - String href = encodePicUrl("62afd81d303c3f827833bb03", "o", "upload"); + String href = encodePicUrl("636b079c303c3f7093fd952a", "o", "upload"); String link = "http://static.fangjia.com/stc/fs/"+href; System.out.println(link); } 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 21121e8b7..ed8766b8c 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 @@ -1364,7 +1364,12 @@ public class WeiXinEvaluationController { System.out.println(link); } if(uploadfiles.size()>0){ - BHBankUtils.inquireUploadFiles2(usersDetail.getName(),model.getQueryId(), model.getFileClass(), uploadfiles); + 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"))); + }else{ + mav.setModel(BasicModel.buildServerErrorModel().setMsg(("文件上传成功!"))); + } } } catch (Exception e) { e.printStackTrace(); diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/util/BHBankUtils.java b/projects/fangjia-open/src/main/java/com/fangjia/open/util/BHBankUtils.java index cda323214..6a861a303 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/util/BHBankUtils.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/util/BHBankUtils.java @@ -349,7 +349,7 @@ public class BHBankUtils { } - public static Integer inquireUploadFiles2(String name, String queryId, Integer fileClass , List uploadfiles){ + public static JSONObject inquireUploadFiles2(String name, String queryId, Integer fileClass , List uploadfiles){ Map params = new HashMap(); params.put("queryId",queryId); params.put("userName",name); @@ -420,10 +420,7 @@ public class BHBankUtils { String content = response.body().string(); JSONObject jsonObj = JSONObject.fromObject(content); System.out.println("上传接口返回:"+jsonObj.toString()); - Integer code = (Integer) jsonObj.get("errCode"); - if(code == 0){ - return code; - } + return jsonObj; }catch (Exception e){ e.printStackTrace(); } diff --git a/projects/fangjia-open/src/main/webapp/weiXinEvaluation/bhreport.ftl b/projects/fangjia-open/src/main/webapp/weiXinEvaluation/bhreport.ftl index eaab26cb0..ecf07ff92 100644 --- a/projects/fangjia-open/src/main/webapp/weiXinEvaluation/bhreport.ftl +++ b/projects/fangjia-open/src/main/webapp/weiXinEvaluation/bhreport.ftl @@ -499,23 +499,10 @@ contentType: false, processData: false, success: function (data) { - if(data == null){ + + if(data.msg && data.msg.indexOf("鎴愬姛")>-1){ alert("涓婁紶鎴愬姛"); window.location.reload(); - // $("#file_wrap_list").remove(); - // var boxes = $("input[name=reportFiles]") - // if(boxes.length>1){ - // var i = 0; - // boxes.forEach(function(element) { - // i++; - // if(i>2){ - // element.remove(); - // } - // }); - // } - // $("a.create-actions08").empty().text("璇烽�夋嫨绫诲瀷") - // $("#fileClass").val("") - // $("a.create-actions08").removeClass("selected") }else{ alert(data.msg); }