From be5497a57926c6d4f6e65d2d5f085a563f9e8aa5 Mon Sep 17 00:00:00 2001
From: gaojuan
Date: Sat, 20 Nov 2021 18:23:48 +0800
Subject: [PATCH 01/23] =?UTF-8?q?=E5=87=BA=E5=85=B7=E6=AD=A3=E5=BC=8F?=
=?UTF-8?q?=E6=8A=A5=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../dal/sql/fangjia/dao/FormalReportDao.java | 7 ++
.../sql/fangjia/dao/FormalReportDaoImpl.java | 7 ++
.../fangjia/dal/sql/model/FormalReport.java | 75 +++++++++++++++++++
.../weixin/WeiXinEvaluationController.java | 59 +++++++++++++++
.../open/model/weixin/EvaluationModel.java | 23 +++++-
.../com/fangjia/open/util/BHBankUtils.java | 62 +++++++++++++--
.../resources/persistence-goojia-fangjia.xml | 1 +
.../src/main/webapp/static/js/report.js | 54 ++++++++++++-
.../src/main/webapp/static/style/wx.css | 6 +-
.../main/webapp/weiXinEvaluation/bhreport.ftl | 18 +++--
.../service/sql/FormalReportService.java | 12 +++
.../service/sql/FormalReportServiceImpl.java | 37 +++++++++
.../service/sql/ReportFileAttachService.java | 2 +
.../sql/ReportFileAttachServiceImpl.java | 8 ++
14 files changed, 354 insertions(+), 17 deletions(-)
create mode 100644 projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/fangjia/dao/FormalReportDao.java
create mode 100644 projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/fangjia/dao/FormalReportDaoImpl.java
create mode 100644 projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/FormalReport.java
create mode 100644 projects/fangjia-service/src/main/java/com/fangjia/service/sql/FormalReportService.java
create mode 100644 projects/fangjia-service/src/main/java/com/fangjia/service/sql/FormalReportServiceImpl.java
diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/fangjia/dao/FormalReportDao.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/fangjia/dao/FormalReportDao.java
new file mode 100644
index 000000000..a06caa12a
--- /dev/null
+++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/fangjia/dao/FormalReportDao.java
@@ -0,0 +1,7 @@
+package com.fangjia.dal.sql.fangjia.dao;
+
+import com.fangjia.dal.SqlDao;
+import com.fangjia.dal.sql.model.FormalReport;
+
+public interface FormalReportDao extends SqlDao {
+}
diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/fangjia/dao/FormalReportDaoImpl.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/fangjia/dao/FormalReportDaoImpl.java
new file mode 100644
index 000000000..72ea5ebbd
--- /dev/null
+++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/fangjia/dao/FormalReportDaoImpl.java
@@ -0,0 +1,7 @@
+package com.fangjia.dal.sql.fangjia.dao;
+
+import com.fangjia.dal.GoojiaFangjiaSqlDao;
+import com.fangjia.dal.sql.model.FormalReport;
+
+public class FormalReportDaoImpl extends GoojiaFangjiaSqlDao implements FormalReportDao {
+}
diff --git a/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/FormalReport.java b/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/FormalReport.java
new file mode 100644
index 000000000..93f5d11fc
--- /dev/null
+++ b/projects/fangjia-dal/src/main/java/com/fangjia/dal/sql/model/FormalReport.java
@@ -0,0 +1,75 @@
+package com.fangjia.dal.sql.model;
+
+import com.fangjia.dal.SqlEntity;
+
+import javax.persistence.*;
+import java.util.Date;
+
+@Entity
+@Table(name = "formal_report")
+public class FormalReport implements SqlEntity {
+ long id;
+
+ long evaluationId;
+ String queryId;
+ long userId;
+ String address;
+ Date dateCreated;
+
+ @Id
+ @Column(name = "id")
+ @GeneratedValue(strategy = GenerationType.AUTO)
+ public long getId() {
+ return id;
+ }
+
+ @Override
+ public void setId(long id) {
+ this.id = id;
+ }
+
+ @Column(name = "evaluation_id")
+ public long getEvaluationId() {
+ return evaluationId;
+ }
+
+ public void setEvaluationId(long evaluationId) {
+ this.evaluationId = evaluationId;
+ }
+
+ @Column(name = "query_id")
+ public String getQueryId() {
+ return queryId;
+ }
+
+ public void setQueryId(String queryId) {
+ this.queryId = queryId;
+ }
+
+ @Column(name = "user_id")
+ public long getUserId() {
+ return userId;
+ }
+
+ public void setUserId(long userId) {
+ this.userId = userId;
+ }
+
+ @Column(name = "address")
+ public String getAddress() {
+ return address;
+ }
+
+ public void setAddress(String address) {
+ this.address = address;
+ }
+
+ @Column(name = "c_date")
+ public Date getDateCreated() {
+ return dateCreated;
+ }
+
+ public void setDateCreated(Date dateCreated) {
+ this.dateCreated = dateCreated;
+ }
+}
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 20817129d..57a4d88b6 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
@@ -105,6 +105,7 @@ public class WeiXinEvaluationController {
private GoldLogsService goldLogsService;
private PriceBorderService priceBorderService;
private BohaiEvaluationAuditService bohaiEvaluationAuditService;
+ private FormalReportService formalReportService;
private FileService fileService;
private ReportFileAttachService reportFileAttachService;
@@ -272,6 +273,10 @@ public class WeiXinEvaluationController {
}
} else if (evaluationAudit!=null && evaluationAudit.getAuditStatus()==1) {
jsonObject.put("shzt", "价格已审核");
+ FormalReport report = formalReportService.findFormalReportById(evaluationAudit.getEvaluationId());
+ if(report != null){
+ jsonObject.put("shzt", "已申请正式报告");
+ }
} else if (evaluationAudit!=null && evaluationAudit.getAuditStatus()==2) {
jsonObject.put("shzt", "价格待审核");
if(evaluationAudit.getHopePrice()>0){
@@ -295,6 +300,11 @@ public class WeiXinEvaluationController {
}
}else if (evaluationAudit!=null && evaluationAudit.getAuditStatus()==3) {
jsonObject.put("shzt", "审核完成");
+
+ FormalReport report = formalReportService.findFormalReportById(evaluationAudit.getEvaluationId());
+ if(report != null){
+ jsonObject.put("shzt", "已申请正式报告");
+ }
}else{
jsonObject.put("shzt", "-");
}
@@ -643,6 +653,8 @@ public class WeiXinEvaluationController {
}
}
+ UserTrades userTrade = userTradesService.findUserTradesByEvaluationId(model.getEvaluationId());
+ model.setUserTrades(userTrade);
if(fjtUser!=null && fjtUser.getRole()==17 && district.getCity().equals("上海")){
Map retMap = getLoanInfo(district, evaluation.getHouseArea());
@@ -1022,6 +1034,49 @@ public class WeiXinEvaluationController {
}
return jsonMmodel;
}
+
+ public Object sendFormalReportApplyAction(EvaluationModel model) {
+ JsonModel jsonModel = new JsonModel();
+ if (StringUtils.isNotBlank(model.getEvaluationId()) && StringUtils.isNotBlank(model.getAddress())) {
+ BohaiEvaluationAudit bohaiEvaluationAudit = bohaiEvaluationAuditService.findByBohaiEvaluationAuditId(Long.valueOf(model.getEvaluationId()));
+ if(bohaiEvaluationAudit!=null){
+ FormalReport formalReport = formalReportService.findFormalReportById(Long.valueOf(model.getEvaluationId()));
+ if(formalReport == null){
+ formalReport = new FormalReport();
+ formalReport.setEvaluationId(Long.valueOf(model.getEvaluationId()));
+ formalReport.setQueryId(bohaiEvaluationAudit.getQueryId());
+ formalReport.setUserId(bohaiEvaluationAudit.getUserId());
+ formalReport.setAddress(model.getAddress());
+ formalReport.setDateCreated(new Date());
+ formalReportService.save(formalReport);
+// UsersDetail usersDetail = usersDetailService.findById(bohaiEvaluationAudit.getUserId());
+ }else{
+ if(!model.getAddress().equals(formalReport.getAddress())){
+ formalReport.setAddress(model.getAddress());
+ formalReportService.update(formalReport);
+ }
+ }
+ Integer code = BHBankUtils.inquireToReport(bohaiEvaluationAudit.getQueryId(), model.getAddress());
+ Map data = new HashMap();
+ data.put("code", code);
+ jsonModel.setJsonModel(data);
+ }
+ }
+ return jsonModel;
+ }
+
+ public Object checkImageAction(EvaluationModel model){
+ JsonModel jsonModel = new JsonModel();
+ if (StringUtils.isNotBlank(model.getEvaluationId())){
+ List datas = reportFileAttachService.findHouseImage(Integer.valueOf(model.getEvaluationId()), 3);
+ Map data = new HashMap();
+ data.put("count", datas.size());
+ jsonModel.setJsonModel(data);
+ }
+ return jsonModel;
+ }
+
+
private void sendToEmail(String fjtUrl, String evaluationId, String email){
try {
@@ -1451,4 +1506,8 @@ public class WeiXinEvaluationController {
public void setReportFileAttachService(ReportFileAttachService reportFileAttachService) {
this.reportFileAttachService = reportFileAttachService;
}
+
+ public void setFormalReportService(FormalReportService formalReportService) {
+ this.formalReportService = formalReportService;
+ }
}
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 ce6cc6080..8de0977f8 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
@@ -7,10 +7,7 @@ import java.util.List;
import java.util.Map;
import com.fangjia.dal.seaweed.model.District;
-import com.fangjia.dal.sql.model.BohaiEvaluationAudit;
-import com.fangjia.dal.sql.model.EvaluationAudit;
-import com.fangjia.dal.sql.model.FjtEvaluation;
-import com.fangjia.dal.sql.model.ReportFileAttach;
+import com.fangjia.dal.sql.model.*;
import com.fangjia.open.model.BaseModel;
import com.fangjia.service.bo.DistrictStatBo;
import org.springframework.web.multipart.commons.CommonsMultipartFile;
@@ -57,6 +54,8 @@ public class EvaluationModel extends BaseModel{
private String queryId;
private Integer fileClass;
private Map> reportFileMap;
+ private UserTrades userTrades;
+ private String address;
public void setId(String id) {
@@ -302,4 +301,20 @@ public class EvaluationModel extends BaseModel{
public void setReportFileMap(Map> reportFileMap) {
this.reportFileMap = reportFileMap;
}
+
+ public UserTrades getUserTrades() {
+ return userTrades;
+ }
+
+ public void setUserTrades(UserTrades userTrades) {
+ this.userTrades = userTrades;
+ }
+
+ public String getAddress() {
+ return address;
+ }
+
+ public void setAddress(String address) {
+ this.address = address;
+ }
}
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 d638fe36d..3d6103e02 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
@@ -75,6 +75,7 @@ public class BHBankUtils {
String content = null;
try {
content = request.get(uri +"/searchAddr/bh/", params, headers, "utf-8");
+ System.out.println("/searchAddr/bh/ :"+content);
if(StringUtils.isNotBlank(content)){
JSONObject jsonObj = JSONObject.fromObject(content);
JSONArray data = (JSONArray) jsonObj.get("data");
@@ -197,6 +198,7 @@ public class BHBankUtils {
String content = null;
try {
content = request.get(uri + "/inquireRecord/bh/", params, headers, "utf-8");
+ System.out.println("/inquireRecord/bh/ "+content);
if(StringUtils.isNotBlank(content)){
JSONObject jsonObj = JSONObject.fromObject(content);
JSONObject data = (JSONObject) jsonObj.get("data");
@@ -282,6 +284,7 @@ public class BHBankUtils {
String content = null;
try {
content = request.get(uri+"/inquireFeedbackCall/bh/", params, headers, "utf-8");
+ System.out.println("/inquireFeedbackCall/bh/:"+content);
if(StringUtils.isNotBlank(content)){
JSONObject jsonObj = JSONObject.fromObject(content);
Integer code = (Integer) jsonObj.get("errCode");
@@ -406,11 +409,6 @@ public class BHBankUtils {
.addFormDataPart("userName",name);
for(File file : uploadfiles){
- System.out.println(file.getAbsoluteFile());
- System.out.println(file.getName());
- System.out.println(file.getPath());
- System.out.println(file.getCanonicalPath());
- System.out.println(file.getParentFile());
builder.addFormDataPart("file",file.getPath(), RequestBody.create(MediaType.parse("application/octet-stream"), file));
}
RequestBody body = builder.build();
@@ -434,4 +432,58 @@ public class BHBankUtils {
return null;
}
+
+
+ public static Integer inquireToReport(String queryId, String reportMsg){
+ String feedbackId = null;
+ List list = new ArrayList();
+ Map params = new HashMap();
+ params.put("queryId",queryId);
+ if(StringUtils.isNotBlank(reportMsg)){
+ params.put("reportMsg",reportMsg);
+ }
+
+
+ List lists = Arrays.asList("queryId", "reportMsg");
+
+ String s = "";
+ for(String key : lists){
+ String value = (String)params.get(key);
+ if(StringUtils.isNotBlank(value)){
+ s = s + value;
+ }
+ }
+ String s1 = null;
+ try {
+ s1 = URLEncoder.encode(s,"utf-8");
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ }
+
+ Integer date1 = (int)(new Date().getTime()/1000);
+ String str = token + date1.toString()+nonce+ s1;
+ String md5str2 = MD5Util.encrypt(str,"utf-8");
+
+ Map headers = new HashMap();
+ headers.put("timestamp", date1.toString());
+ headers.put("sign", md5str2);
+ headers.put("nonce", nonce.toString());
+ HttpRequest request = new HttpRequest();
+ String content = null;
+ try {
+ content = request.post(uri+"/inquireToReport/bh/", params, headers, "utf-8");
+ if(StringUtils.isNotBlank(content)){
+ JSONObject jsonObj = JSONObject.fromObject(content);
+ Integer code = (Integer) jsonObj.get("errCode");
+ if (code == 0) {
+ return code;
+ }
+
+ }
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ return null;
+ }
+
}
diff --git a/projects/fangjia-open/src/main/resources/persistence-goojia-fangjia.xml b/projects/fangjia-open/src/main/resources/persistence-goojia-fangjia.xml
index 9004315d0..69ec4700c 100644
--- a/projects/fangjia-open/src/main/resources/persistence-goojia-fangjia.xml
+++ b/projects/fangjia-open/src/main/resources/persistence-goojia-fangjia.xml
@@ -17,6 +17,7 @@
com.fangjia.dal.sql.model.GoldLogs
com.fangjia.dal.sql.model.BohaiEvaluationAudit
com.fangjia.dal.sql.model.ReportFileAttach
+ com.fangjia.dal.sql.model.FormalReport
true
\ No newline at end of file
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 2d8366e4a..92ef631b5 100644
--- a/projects/fangjia-open/src/main/webapp/static/js/report.js
+++ b/projects/fangjia-open/src/main/webapp/static/js/report.js
@@ -264,7 +264,7 @@ $('.little_btn').on('click', function () {
/* 涓嬭浇璇勪及鎶ュ憡 */
$('.download_btn').on('click', function () {
- $.prompt('璇勪及鎶ュ憡灏嗗敖蹇彂閫佸埌鎮ㄧ殑閭锛岃娉ㄦ剰鏌ユ敹锛岃阿璋紒濡傛湁鐤戦棶鍙笌鎴戜滑鑱旂郴锛�62392317/62397088', '璇峰~鍐欐姤鍛婂彂閫侀偖绠�', function (value) {
+ $.prompt('璇勪及鎶ュ憡灏嗗敖蹇彂閫佸埌鎮ㄧ殑閭锛岃娉ㄦ剰鏌ユ敹锛岃阿璋紒濡傛湁鐤戦棶鍙笌鎴戜滑鑱旂郴锛�62392317', '璇峰~鍐欐姤鍛婂彂閫侀偖绠�', function (value) {
var email = $(".modal-text-input").val();
if(email==""){
$.alert('閭涓嶈兘涓虹┖');
@@ -281,6 +281,7 @@ $('.download_btn').on('click', function () {
success:function(data){
$.cookie("fjt-lhemail",email, {path:"/",expires: 30})
alert("鎮ㄧ殑淇℃伅宸叉彁浜ゆ垚鍔�!");
+ window.location.reload();
}
})
}
@@ -297,6 +298,57 @@ $('.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('璇蜂笂浼犳埧灞嬬収鐗囷紒');
+ }
+ }
+ })
+
+});
+
+function clickFormalReport(){
+ $.prompt('姝e紡鎶ュ憡灏嗗敖蹇偖瀵勭粰鎮紝璇锋敞鎰忔煡鏀讹紝璋㈣阿锛佸鏈夌枒闂彲涓庢垜浠仈绯伙細62392317', '璇峰~鍐欐寮忔姤鍛婇偖瀵勫湴鍧�', function (value) {
+ var address = $(".modal-text-input").val();
+ if(address==""){
+ $.alert('鍦板潃涓嶈兘涓虹┖');
+ }else{
+ $.ajax({
+ url:"sendFormalReportApply",
+ data:{
+ evaluationId:eId,
+ address:address
+ },
+ dataType:"json",
+ success:function(data){
+ $.cookie("fjt-formal-report",address, {path:"/",expires: 30})
+ alert("鎮ㄧ殑鐢宠宸叉彁浜わ紝璇疯�愬績绛夊緟!");
+ }
+ })
+ }
+ },
+ function (value) {
+
+ });
+
+ var fjtReport = $.cookie("fjt-formal-report");
+ if(fjtReport){
+ $(".modal-text-input").val(fjtReport);
+ }
+}
+
+
function collectDistrict(eId, status){
$.ajax({
url:"collectDistrict",
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 780db8fe6..269a1a00e 100644
--- a/projects/fangjia-open/src/main/webapp/static/style/wx.css
+++ b/projects/fangjia-open/src/main/webapp/static/style/wx.css
@@ -64,6 +64,10 @@ input::-webkit-input-placeholder{
.button.button-fill2{background:#ec881d;border-radius:0;width:100%;z-index:20;color: #fff; border: none;}
.button.button-fill2:active{background:#bd6c16;}
+.button.button-fill3{background:#ec881d;border-radius:0;bottom:0;z-index:20;position: fixed;color: #fff; border: none;}
+.button.p1{left: 0;}
+.button.p2{right: 0;}
+
.content-block{padding:0;margin:0;}
.content-block p.di a{color:#a9a9a9;}
.row{margin:0;}
@@ -115,7 +119,7 @@ input::-webkit-input-placeholder{
.topic01{line-height:0.7rem;margin-bottom:-1px;}
.topic01 .topicContent{padding:0 20px;}
.topic01 .topicContent p{font-size:0.7rem;}
-.topic01 .topicContent01{padding:12px 20px;padding-bottom:0;}
+.topic01 .topicContent01{padding:12px 10px;padding-bottom:0;}
.charts{height: 200px;margin-top: 20px;text-align: center;}
.topicContent img{width:25%;background:#ccc;float:left;margin: 0 4% 5%;background-size:100%;}
.cancelCollection:active{
diff --git a/projects/fangjia-open/src/main/webapp/weiXinEvaluation/bhreport.ftl b/projects/fangjia-open/src/main/webapp/weiXinEvaluation/bhreport.ftl
index d5693153c..cebefe884 100644
--- a/projects/fangjia-open/src/main/webapp/weiXinEvaluation/bhreport.ftl
+++ b/projects/fangjia-open/src/main/webapp/weiXinEvaluation/bhreport.ftl
@@ -429,7 +429,13 @@
<#if bohaiEvaluationAudit?? && fjtEvaluation.lender?? && bohaiEvaluationAudit.auditStatus!=0 && reportFileMap?? && reportFileMap["2"]??>
-
涓嬭浇璇勪及鎶ュ憡
+ <#if userTrades??>
+
涓嬭浇璇勪及鎶ュ憡
+
鍑哄叿姝e紡鎶ュ憡
+ <#else>
+
涓嬭浇璇勪及鎶ュ憡
+ #if>
+
#if>
@@ -521,7 +527,7 @@
onClick: function () {
$("a.create-actions08").empty().text(this.text).addClass("selected")
$("#fileClass").val("1")
- $("input[name=reportFiles]").attr("accept","application/pdf")
+ $("input[name=reportFiles]").attr("accept","image/*")
}
},
{
@@ -563,11 +569,11 @@ function changeFile(d){
var val = $(d).attr("accept")
if(val==""){
var fileClass = $("#fileClass").val()
- if(fileClass == "1"){
- $(d).attr("accept","application/pdf")
- }else{
+ // if(fileClass == "1"){
+ // $(d).attr("accept","application/pdf")
+ // }else{
$(d).attr("accept","image/*")
- }
+ // }
}
}
diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/sql/FormalReportService.java b/projects/fangjia-service/src/main/java/com/fangjia/service/sql/FormalReportService.java
new file mode 100644
index 000000000..04f6d590f
--- /dev/null
+++ b/projects/fangjia-service/src/main/java/com/fangjia/service/sql/FormalReportService.java
@@ -0,0 +1,12 @@
+package com.fangjia.service.sql;
+
+import com.fangjia.dal.sql.model.FormalReport;
+
+public interface FormalReportService {
+
+ FormalReport findFormalReportById(long evaluationId);
+
+ void save(FormalReport formalReport);
+
+ void update(FormalReport formalReport);
+}
diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/sql/FormalReportServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/sql/FormalReportServiceImpl.java
new file mode 100644
index 000000000..bc1cb5f11
--- /dev/null
+++ b/projects/fangjia-service/src/main/java/com/fangjia/service/sql/FormalReportServiceImpl.java
@@ -0,0 +1,37 @@
+package com.fangjia.service.sql;
+
+import com.fangjia.dal.QueryParam;
+import com.fangjia.dal.sql.fangjia.dao.FormalReportDao;
+import com.fangjia.dal.sql.model.FormalReport;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class FormalReportServiceImpl implements FormalReportService {
+ private FormalReportDao formalReportDao;
+
+ public FormalReportDao getFormalReportDao() {
+ return formalReportDao;
+ }
+
+ public void setFormalReportDao(FormalReportDao formalReportDao) {
+ this.formalReportDao = formalReportDao;
+ }
+
+ @Override
+ public FormalReport findFormalReportById(long evaluationId) {
+ List params = new ArrayList(1);
+ params.add(new QueryParam("evaluationId", evaluationId));
+ return formalReportDao.findFirstByParams(params);
+ }
+
+ @Override
+ public void save(FormalReport formalReport) {
+ formalReportDao.save(formalReport);
+ }
+
+ @Override
+ public void update(FormalReport formalReport) {
+ formalReportDao.update(formalReport);
+ }
+}
diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/sql/ReportFileAttachService.java b/projects/fangjia-service/src/main/java/com/fangjia/service/sql/ReportFileAttachService.java
index ad308238d..e0bc8e2be 100644
--- a/projects/fangjia-service/src/main/java/com/fangjia/service/sql/ReportFileAttachService.java
+++ b/projects/fangjia-service/src/main/java/com/fangjia/service/sql/ReportFileAttachService.java
@@ -10,4 +10,6 @@ public interface ReportFileAttachService {
ReportFileAttach findFirstByParams(Integer evaluationId, String queryId, Integer userId, Integer fileClass, String fileName);
List findAllByParams(Integer evaluationId, String queryId, Integer userId);
+
+ List findHouseImage(Integer evaluationId, Integer fileClass);
}
diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/sql/ReportFileAttachServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/sql/ReportFileAttachServiceImpl.java
index 52d8819f2..7b9df192a 100644
--- a/projects/fangjia-service/src/main/java/com/fangjia/service/sql/ReportFileAttachServiceImpl.java
+++ b/projects/fangjia-service/src/main/java/com/fangjia/service/sql/ReportFileAttachServiceImpl.java
@@ -42,4 +42,12 @@ public class ReportFileAttachServiceImpl implements ReportFileAttachService{
params.add(new QueryParam("queryId", queryId));
return reportFileAttachDao.findAllByParams(params);
}
+
+ @Override
+ public List findHouseImage(Integer evaluationId, Integer fileClass) {
+ List params = new ArrayList();
+ params.add(new QueryParam("evaluationId", evaluationId));
+ params.add(new QueryParam("fileClass", fileClass));
+ return reportFileAttachDao.findAllByParams(params);
+ }
}
From c91457acc969d6711790e2dc65a5220af1034d2c Mon Sep 17 00:00:00 2001
From: gaojuan
Date: Sat, 20 Nov 2021 19:06:25 +0800
Subject: [PATCH 02/23] =?UTF-8?q?=E6=B7=BB=E5=8A=A0log?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/main/java/com/fangjia/open/util/BHBankUtils.java | 2 ++
1 file changed, 2 insertions(+)
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 3d6103e02..d3ad7f1be 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
@@ -471,7 +471,9 @@ public class BHBankUtils {
HttpRequest request = new HttpRequest();
String content = null;
try {
+ System.out.println("调用渤海转评估报告 "+queryId);
content = request.post(uri+"/inquireToReport/bh/", params, headers, "utf-8");
+ System.out.println("完成调用渤海转评估报告 "+content);
if(StringUtils.isNotBlank(content)){
JSONObject jsonObj = JSONObject.fromObject(content);
Integer code = (Integer) jsonObj.get("errCode");
From e411a92903a82ffa578a9060cde16f9a198f36a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=96=87=E8=89=B3?=
Date: Sat, 20 Nov 2021 21:25:53 +0800
Subject: [PATCH 03/23] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8F=8B=E8=BE=BEk8s?=
=?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
deliverables/k8s/fangjia-youda-manager.yaml | 77 +++++++++++++++++++++
1 file changed, 77 insertions(+)
create mode 100644 deliverables/k8s/fangjia-youda-manager.yaml
diff --git a/deliverables/k8s/fangjia-youda-manager.yaml b/deliverables/k8s/fangjia-youda-manager.yaml
new file mode 100644
index 000000000..28ae4b99b
--- /dev/null
+++ b/deliverables/k8s/fangjia-youda-manager.yaml
@@ -0,0 +1,77 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: fangjia-youda-manager
+ namespace: fangjia
+spec:
+ replicas: 1
+ strategy:
+ type: RollingUpdate
+ rollingUpdate:
+ maxSurge: 1
+ maxUnavailable: 0
+ revisionHistoryLimit: 5
+ selector:
+ matchLabels:
+ project: fangjia-youda-manager
+ app: fangjia
+ template:
+ metadata:
+ labels:
+ project: fangjia-youda-manager
+ app: fangjia
+ spec:
+ imagePullSecrets:
+ - name: nexus-registry-secret
+ nodeSelector:
+ app: fangjia
+ containers:
+ - name: fangjia-youda-manager
+ image: 192.168.0.19:9012/fangjia-youda-manager:1.1
+ imagePullPolicy: Always
+ ports:
+ - containerPort: 8080
+ name: web
+ protocol: TCP
+ readinessProbe:
+ httpGet:
+ path: /login
+ port: web
+ initialDelaySeconds: 5
+ periodSeconds: 10
+ livenessProbe:
+ httpGet:
+ path: /login
+ port: web
+ initialDelaySeconds: 10
+ periodSeconds: 5
+ volumeMounts:
+ - name: host-time
+ mountPath: /etc/localtime
+ - name: goojiaconfig
+ mountPath: /home/goojia/goojiaconfig
+ - name: logs
+ mountPath: /home/goojia/logs
+
+ volumes:
+ - name: host-time
+ hostPath:
+ path: /etc/localtime
+---
+apiVersion: v1
+kind: Service
+metadata:
+ name: fangjia-youda-manager
+ namespace: fangjia
+ labels:
+ project: fangjia-youda-manager
+ app: fangjia
+spec:
+ type: NodePort
+ selector:
+ project: fangjia-youda-manager
+ app: fangjia
+ ports:
+ - port: 8080
+ targetPort: 8080
+ nodePort: 30006
\ No newline at end of file
From 054c20ba01b10b4ec0af65a20c376cf1507f9342 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=96=87=E8=89=B3?=
Date: Sat, 20 Nov 2021 21:34:27 +0800
Subject: [PATCH 04/23] =?UTF-8?q?=E4=BF=AE=E6=94=B9k8s=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
deliverables/k8s/fangjia-youda-manager.yaml | 5 -----
1 file changed, 5 deletions(-)
diff --git a/deliverables/k8s/fangjia-youda-manager.yaml b/deliverables/k8s/fangjia-youda-manager.yaml
index 28ae4b99b..2fa388c75 100644
--- a/deliverables/k8s/fangjia-youda-manager.yaml
+++ b/deliverables/k8s/fangjia-youda-manager.yaml
@@ -48,11 +48,6 @@ spec:
volumeMounts:
- name: host-time
mountPath: /etc/localtime
- - name: goojiaconfig
- mountPath: /home/goojia/goojiaconfig
- - name: logs
- mountPath: /home/goojia/logs
-
volumes:
- name: host-time
hostPath:
From 6da193c1e0ff04c919d450dbae4337feb050aa36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=96=87=E8=89=B3?=
Date: Sat, 20 Nov 2021 22:09:45 +0800
Subject: [PATCH 05/23] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8F=8B=E8=BE=BEk8s?=
=?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../k8s/fangjia-youda-web-business.yaml | 72 +++++++++++++++++++
.../k8s/fangjia-youda-web-customer.yaml | 72 +++++++++++++++++++
2 files changed, 144 insertions(+)
create mode 100644 deliverables/k8s/fangjia-youda-web-business.yaml
create mode 100644 deliverables/k8s/fangjia-youda-web-customer.yaml
diff --git a/deliverables/k8s/fangjia-youda-web-business.yaml b/deliverables/k8s/fangjia-youda-web-business.yaml
new file mode 100644
index 000000000..ee19e4c63
--- /dev/null
+++ b/deliverables/k8s/fangjia-youda-web-business.yaml
@@ -0,0 +1,72 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: fangjia-youda-web-business
+ namespace: fangjia
+spec:
+ replicas: 1
+ strategy:
+ type: RollingUpdate
+ rollingUpdate:
+ maxSurge: 1
+ maxUnavailable: 0
+ revisionHistoryLimit: 5
+ selector:
+ matchLabels:
+ project: fangjia-youda-web-business
+ app: fangjia
+ template:
+ metadata:
+ labels:
+ project: fangjia-youda-web-business
+ app: fangjia
+ spec:
+ imagePullSecrets:
+ - name: nexus-registry-secret
+ nodeSelector:
+ app: fangjia
+ containers:
+ - name: fangjia-youda-web-business
+ image: 192.168.0.19:9012/fangjia-youda-web-business:1.1
+ imagePullPolicy: Always
+ ports:
+ - containerPort: 8080
+ name: web
+ protocol: TCP
+ readinessProbe:
+ httpGet:
+ path: /login
+ port: web
+ initialDelaySeconds: 5
+ periodSeconds: 10
+ livenessProbe:
+ httpGet:
+ path: /login
+ port: web
+ initialDelaySeconds: 10
+ periodSeconds: 5
+ volumeMounts:
+ - name: host-time
+ mountPath: /etc/localtime
+ volumes:
+ - name: host-time
+ hostPath:
+ path: /etc/localtime
+---
+apiVersion: v1
+kind: Service
+metadata:
+ name: fangjia-youda-web-business
+ namespace: fangjia
+ labels:
+ project: fangjia-youda-web-business
+ app: fangjia
+spec:
+ type: NodePort
+ selector:
+ project: fangjia-youda-web-business
+ app: fangjia
+ ports:
+ - port: 8080
+ targetPort: 8080
+ nodePort: 30012
\ No newline at end of file
diff --git a/deliverables/k8s/fangjia-youda-web-customer.yaml b/deliverables/k8s/fangjia-youda-web-customer.yaml
new file mode 100644
index 000000000..d8374216b
--- /dev/null
+++ b/deliverables/k8s/fangjia-youda-web-customer.yaml
@@ -0,0 +1,72 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: fangjia-youda-web-customer
+ namespace: fangjia
+spec:
+ replicas: 1
+ strategy:
+ type: RollingUpdate
+ rollingUpdate:
+ maxSurge: 1
+ maxUnavailable: 0
+ revisionHistoryLimit: 5
+ selector:
+ matchLabels:
+ project: fangjia-youda-web-customer
+ app: fangjia
+ template:
+ metadata:
+ labels:
+ project: fangjia-youda-web-customer
+ app: fangjia
+ spec:
+ imagePullSecrets:
+ - name: nexus-registry-secret
+ nodeSelector:
+ app: fangjia
+ containers:
+ - name: fangjia-youda-web-customer
+ image: 192.168.0.19:9012/fangjia-youda-web-customer:1.1
+ imagePullPolicy: Always
+ ports:
+ - containerPort: 8080
+ name: web
+ protocol: TCP
+ readinessProbe:
+ httpGet:
+ path: /login
+ port: web
+ initialDelaySeconds: 5
+ periodSeconds: 10
+ livenessProbe:
+ httpGet:
+ path: /login
+ port: web
+ initialDelaySeconds: 10
+ periodSeconds: 5
+ volumeMounts:
+ - name: host-time
+ mountPath: /etc/localtime
+ volumes:
+ - name: host-time
+ hostPath:
+ path: /etc/localtime
+---
+apiVersion: v1
+kind: Service
+metadata:
+ name: fangjia-youda-web-customer
+ namespace: fangjia
+ labels:
+ project: fangjia-youda-web-customer
+ app: fangjia
+spec:
+ type: NodePort
+ selector:
+ project: fangjia-youda-web-customer
+ app: fangjia
+ ports:
+ - port: 8080
+ targetPort: 8080
+ nodePort: 30011
\ No newline at end of file
From 6005c5da3e8d420061159c5546c8719a800da443 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=96=87=E8=89=B3?=
Date: Sat, 20 Nov 2021 22:16:59 +0800
Subject: [PATCH 06/23] =?UTF-8?q?=E4=BF=AE=E6=94=B9k8s=E9=85=8D=E7=BD=AE?=
=?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
deliverables/k8s/fangjia-youda-web-business.yaml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/deliverables/k8s/fangjia-youda-web-business.yaml b/deliverables/k8s/fangjia-youda-web-business.yaml
index ee19e4c63..74a695934 100644
--- a/deliverables/k8s/fangjia-youda-web-business.yaml
+++ b/deliverables/k8s/fangjia-youda-web-business.yaml
@@ -35,13 +35,13 @@ spec:
protocol: TCP
readinessProbe:
httpGet:
- path: /login
+ path: /login/login
port: web
initialDelaySeconds: 5
periodSeconds: 10
livenessProbe:
httpGet:
- path: /login
+ path: /login/login
port: web
initialDelaySeconds: 10
periodSeconds: 5
From 4f01c286b5cb2efbe0e1b9b38840bf14cfee5686 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=96=87=E8=89=B3?=
Date: Sat, 20 Nov 2021 22:27:32 +0800
Subject: [PATCH 07/23] k8s
---
deliverables/k8s/fangjia-youda-web-business.yaml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/deliverables/k8s/fangjia-youda-web-business.yaml b/deliverables/k8s/fangjia-youda-web-business.yaml
index 74a695934..ee19e4c63 100644
--- a/deliverables/k8s/fangjia-youda-web-business.yaml
+++ b/deliverables/k8s/fangjia-youda-web-business.yaml
@@ -35,13 +35,13 @@ spec:
protocol: TCP
readinessProbe:
httpGet:
- path: /login/login
+ path: /login
port: web
initialDelaySeconds: 5
periodSeconds: 10
livenessProbe:
httpGet:
- path: /login/login
+ path: /login
port: web
initialDelaySeconds: 10
periodSeconds: 5
From 3868973454d715edb2a139c0ba54a580ed54b008 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=96=87=E8=89=B3?=
Date: Sat, 20 Nov 2021 22:42:53 +0800
Subject: [PATCH 08/23] =?UTF-8?q?=E4=BF=AE=E6=94=B9k8s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
deliverables/k8s/fangjia-static.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/deliverables/k8s/fangjia-static.yaml b/deliverables/k8s/fangjia-static.yaml
index da58e88a9..fa7f9b842 100644
--- a/deliverables/k8s/fangjia-static.yaml
+++ b/deliverables/k8s/fangjia-static.yaml
@@ -98,4 +98,4 @@ spec:
ports:
- port: 8080
targetPort: 8080
- nodePort: 30005
\ No newline at end of file
+ nodePort: 30013
\ No newline at end of file
From 820fde272c3c40b5418d81ccb0af16f729461667 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=96=87=E8=89=B3?=
Date: Sat, 20 Nov 2021 23:43:39 +0800
Subject: [PATCH 09/23] fix bug
---
.../src/main/java/com/fangjia/stc2/GetFileServlet2.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/projects/fangjia-static/src/main/java/com/fangjia/stc2/GetFileServlet2.java b/projects/fangjia-static/src/main/java/com/fangjia/stc2/GetFileServlet2.java
index 5ba1a9655..dc9513ded 100644
--- a/projects/fangjia-static/src/main/java/com/fangjia/stc2/GetFileServlet2.java
+++ b/projects/fangjia-static/src/main/java/com/fangjia/stc2/GetFileServlet2.java
@@ -80,6 +80,7 @@ public class GetFileServlet2 extends HttpServlet {
String reqUrl = req.getRequestURI();
String i = reqUrl.substring(reqUrl.indexOf("/fs/") + 4, reqUrl.length());
+ System.out.println(i);
if (StringUtils.isBlank(i)) {
resp.setStatus(HttpServletResponse.SC_NOT_FOUND);
return;
From 80b1c7f3c49785f5f9e547b24cc53555841f0e9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=96=87=E8=89=B3?=
Date: Sat, 20 Nov 2021 23:44:39 +0800
Subject: [PATCH 10/23] fix bug
---
.../src/main/java/com/fangjia/stc2/GetFileServlet2.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/projects/fangjia-static/src/main/java/com/fangjia/stc2/GetFileServlet2.java b/projects/fangjia-static/src/main/java/com/fangjia/stc2/GetFileServlet2.java
index dc9513ded..00c5979c9 100644
--- a/projects/fangjia-static/src/main/java/com/fangjia/stc2/GetFileServlet2.java
+++ b/projects/fangjia-static/src/main/java/com/fangjia/stc2/GetFileServlet2.java
@@ -81,6 +81,7 @@ public class GetFileServlet2 extends HttpServlet {
String i = reqUrl.substring(reqUrl.indexOf("/fs/") + 4, reqUrl.length());
System.out.println(i);
+
if (StringUtils.isBlank(i)) {
resp.setStatus(HttpServletResponse.SC_NOT_FOUND);
return;
From 9486566588809a23b103bdb690f8fe2de01bc376 Mon Sep 17 00:00:00 2001
From: gaojuan
Date: Wed, 24 Nov 2021 13:58:01 +0800
Subject: [PATCH 11/23] update
---
.../src/main/java/com/fangjia/open/util/BHBankUtils.java | 4 ++--
.../src/main/webapp/weiXinEvaluation/bhreport.ftl | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
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 d3ad7f1be..3229b9845 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
@@ -117,8 +117,8 @@ public class BHBankUtils {
if(StringUtils.isNotBlank(ev.getAddress())){
params.put("buildName", ev.getAddress());
}
- if(StringUtils.isNotBlank(ev.getUnitNum())){
- params.put("unitCode", ev.getUnitNum());
+ if(StringUtils.isNotBlank(ev.getHouseNum())){
+ params.put("unitCode", ev.getHouseNum());// 渤海认为的单元号是楼栋号
}
if(ev.getHouseFloor()>0){
params.put("floor", String.valueOf(ev.getHouseFloor()));
diff --git a/projects/fangjia-open/src/main/webapp/weiXinEvaluation/bhreport.ftl b/projects/fangjia-open/src/main/webapp/weiXinEvaluation/bhreport.ftl
index cebefe884..e70200bda 100644
--- a/projects/fangjia-open/src/main/webapp/weiXinEvaluation/bhreport.ftl
+++ b/projects/fangjia-open/src/main/webapp/weiXinEvaluation/bhreport.ftl
@@ -385,7 +385,7 @@
<#if fjtEvaluation.basementArea??&&(fjtEvaluation.basementArea!>0)>${fjtEvaluation.basementArea!?string('0.##')}骞崇背<#else>-#if>
- <#if fjtEvaluation.basementArea??&&(fjtEvaluation.atticArea!>0)>${fjtEvaluation.atticArea!?string('0.##')}骞崇背<#else>-#if>
+ <#if fjtEvaluation.atticArea??&&(fjtEvaluation.atticArea!>0)>${fjtEvaluation.atticArea!?string('0.##')}骞崇背<#else>-#if>
From 1f73bca57f269246249c6a2feb306eb0e9b30bb9 Mon Sep 17 00:00:00 2001
From: gaojuan
Date: Wed, 24 Nov 2021 14:00:17 +0800
Subject: [PATCH 12/23] =?UTF-8?q?=E5=A4=9A=E4=BD=99=E5=BC=95=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../weixin/WeiXinEvaluationController.java | 57 ++++++++-----------
1 file changed, 24 insertions(+), 33 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 57a4d88b6..5b70348d4 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
@@ -1,38 +1,5 @@
package com.fangjia.open.controllers.weixin;
-import java.io.*;
-import java.net.URLDecoder;
-import java.net.URLEncoder;
-import java.text.DecimalFormat;
-import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import com.fangjia.core.util.HttpRequest;
-import com.fangjia.dal.sql.model.*;
-import com.fangjia.open.OpenConfig;
-import com.fangjia.open.dto.UniversalDto;
-import com.fangjia.open.model.BasicModel;
-import com.fangjia.open.model.FilesModel;
-import com.fangjia.open.util.*;
-import com.fangjia.service.mongo.fangjia.*;
-import com.fangjia.service.sql.*;
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
-
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.math.NumberUtils;
-import org.apache.tools.ant.util.DateUtils;
-import org.bson.types.ObjectId;
-import org.sothis.core.util.Pager;
-import org.sothis.web.mvc.ActionContext;
-import org.sothis.web.mvc.annotation.Param;
-
import com.fangjia.core.util.DataUtil;
import com.fangjia.core.util.DateUtil;
import com.fangjia.dal.common.DistrictKey;
@@ -42,9 +9,12 @@ import com.fangjia.dal.mongo.model.LatlngPolygon;
import com.fangjia.dal.mongo.model.PriceBorder;
import com.fangjia.dal.mongo.model.bkoff.DistrictHouseStat;
import com.fangjia.dal.seaweed.model.District;
+import com.fangjia.dal.sql.model.*;
import com.fangjia.open.compatible.model.JsonModel;
+import com.fangjia.open.model.BasicModel;
import com.fangjia.open.model.RestfulModelAndView;
import com.fangjia.open.model.weixin.EvaluationModel;
+import com.fangjia.open.util.*;
import com.fangjia.service.bo.DistrictStatBo;
import com.fangjia.service.bo.HouseBo;
import com.fangjia.service.datastore.DistrictService;
@@ -57,13 +27,34 @@ import com.fangjia.service.email.EmailService;
import com.fangjia.service.email.Mail;
import com.fangjia.service.email.MailUser;
import com.fangjia.service.mongo.bkoff.DistrictHouseStatService;
+import com.fangjia.service.mongo.fangjia.*;
import com.fangjia.service.sms.SmsException;
import com.fangjia.service.sms.SmsService;
+import com.fangjia.service.sql.*;
import com.fangjia.service.user.UsersInfoService;
import com.fangjia.service.util.CookieUtils;
import com.google.common.collect.ImmutableMap;
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.math.NumberUtils;
+import org.apache.tools.ant.util.DateUtils;
+import org.bson.types.ObjectId;
+import org.sothis.core.util.Pager;
+import org.sothis.web.mvc.ActionContext;
+import org.sothis.web.mvc.annotation.Param;
import org.springframework.web.multipart.commons.CommonsMultipartFile;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.*;
+import java.text.DecimalFormat;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
/**
* Created by wenyan on 2016/7/15.
*/
From 4b495f1c52218a7ac532c81a6fa687e37989df06 Mon Sep 17 00:00:00 2001
From: gaojuan
Date: Thu, 25 Nov 2021 09:44:18 +0800
Subject: [PATCH 13/23] update bug
---
.../fangjia-open/src/main/webapp/weiXinEvaluation/report.ftl | 1 +
1 file changed, 1 insertion(+)
diff --git a/projects/fangjia-open/src/main/webapp/weiXinEvaluation/report.ftl b/projects/fangjia-open/src/main/webapp/weiXinEvaluation/report.ftl
index 13c360f37..fd5351b5d 100644
--- a/projects/fangjia-open/src/main/webapp/weiXinEvaluation/report.ftl
+++ b/projects/fangjia-open/src/main/webapp/weiXinEvaluation/report.ftl
@@ -387,6 +387,7 @@