Merge branch 'open_bohai' into 'master'

显示小数点

See merge request !454
This commit is contained in:
2022-11-18 11:15:11 +08:00
6 changed files with 72 additions and 27 deletions
@@ -1845,7 +1845,7 @@ public class DataUtil {
//
// System.out.println(FourUpSixInto("258.393", 2));
String href = encodePicUrl("636b079c303c3f7093fd952a", "o", "upload");
String href = encodePicUrl("63628191303c3f2682f4fbe6", "o", "upload");
String link = "http://static.fangjia.com/stc/fs/"+href;
System.out.println(link);
}
@@ -232,13 +232,39 @@ public class WeiXinEvaluationController {
jsonObject.put("rn", fjtEvaluation.getRoomNum());
jsonObject.put("wylx", StringUtils.isBlank(BUILDTYPE_MAP.get(fjtEvaluation.getBuildType())) ? "-" : BUILDTYPE_MAP.get(fjtEvaluation.getBuildType()));//物业类型
jsonObject.put("mj", fjtEvaluation.getHouseArea());//面积
String zj = "-";
if(evaluationAudit != null && evaluationAudit.getInquirePrice() > 0){
zj = String.valueOf((int)(evaluationAudit.getInquirePrice() / 10000));
double zj = DataUtil.getDoubleRound(2, evaluationAudit.getInquirePrice() / 10000.0);
if(zj == (int)zj){
jsonObject.put("zj", (int)zj);//总价
}else{
jsonObject.put("zj", zj);//总价
}
}else{
jsonObject.put("zj", "-");//总价
}
jsonObject.put("zj", zj);//总价
jsonObject.put("ckj", (evaluationAudit == null || evaluationAudit.getHopePrice() == null) ? "-" : (int)(evaluationAudit.getHopePrice()/ 10000));//期望价
jsonObject.put("zsj", (evaluationAudit == null || evaluationAudit.getLastPrice() == null) ? "-" : (int)(evaluationAudit.getLastPrice()/ 10000));//终审价
if(evaluationAudit == null || evaluationAudit.getHopePrice() == null){
jsonObject.put("ckj","-");
}else{
double ckj = DataUtil.getDoubleRound(2,evaluationAudit.getHopePrice()/10000.0);
if(ckj == (int)ckj){
jsonObject.put("ckj", (int)ckj);//期望价
}else{
jsonObject.put("ckj", ckj);//期望价
}
}
if(evaluationAudit == null || evaluationAudit.getLastPrice() == null){
jsonObject.put("zsj","-");
}else{
double zsj = DataUtil.getDoubleRound(2,evaluationAudit.getLastPrice()/ 10000.0);
if(zsj == (int)zsj){
jsonObject.put("zsj", (int)zsj);//终审价
}else{
jsonObject.put("zsj", zsj);//终审价
}
}
jsonObject.put("zdr", StringUtils.isBlank(fjtEvaluation.getLender()) ? "-" : fjtEvaluation.getLender());//主贷人
if(evaluationAudit==null || (evaluationAudit!=null && StringUtils.isBlank(evaluationAudit.getInquireRemark()))){
jsonObject.put("pgsm","");//评估说明
@@ -258,7 +284,13 @@ public class WeiXinEvaluationController {
if(totalPrice>0){
evaluationAudit.setAuditStatus(1);
evaluationAudit.setInquirePrice(totalPrice);
jsonObject.put("zj", (int)(totalPrice/10000));
double zj = DataUtil.getDoubleRound(2, totalPrice / 10000.0);
if(zj == (int)zj){
jsonObject.put("zj", (int)zj);//总价
}else{
jsonObject.put("zj", zj);//总价
}
bohaiEvaluationAuditService.updateBohaiEvaluationAudit(evaluationAudit);
jsonObject.put("shzt", "价格已审核");
}
@@ -288,7 +320,12 @@ public class WeiXinEvaluationController {
evaluationAudit.setFeedbackMsg(callMsg.toString());
}
jsonObject.put("zsj",(int)(inquirePrice/ 10000));//终审价
double zsj = DataUtil.getDoubleRound(2,inquirePrice/ 10000.0);//终审价
if(zsj == (int)zsj){
jsonObject.put("zsj", (int)zsj);//终审价
}else{
jsonObject.put("zsj", zsj);//终审价
}
bohaiEvaluationAuditService.updateBohaiEvaluationAudit(evaluationAudit);
jsonObject.put("shzt", "审核完成");
}
@@ -407,6 +444,9 @@ public class WeiXinEvaluationController {
public Object businessUserEvaluateAction(EvaluationModel model, HttpServletRequest request){
JsonModel json = new JsonModel();
Map<String, String> data = new HashMap<String, String>();
District district = districtService.findById(model.getDistrict().getId());
FjtEvaluation evaluation = model.getFjtEvaluation();
if(evaluation.getHouseArea() <=0 || evaluation.getHouseHight() <= 0
@@ -511,7 +551,7 @@ public class WeiXinEvaluationController {
}
System.out.println("渤海询价搜索 "+evaluation.getAddress());
JSONObject bhApiResult = BHBankUtils.getInquirePrice(model, bhMatchMap, usersDetail, evaluation.getTotalPrice());
if(bhApiResult!=null){
if(bhApiResult!=null && (Integer)bhApiResult.get("errCode")==0){
System.out.println("渤海询价搜索结果 "+bhApiResult.toString());
JSONObject dataObj = (JSONObject) bhApiResult.get("data");
String queryId = (String) dataObj.get("queryId");
@@ -540,16 +580,16 @@ public class WeiXinEvaluationController {
audit.setDateCreated(new Date());
audit.setDateCreated(new Date());
bohaiEvaluationAuditService.saveBohaiEvaluationAudit(audit);
}else{
data.put("msg", "评估失败!");
}
}else{
fjtEvaluationService.saveEvaluation(evaluation);
System.out.println("保存评估记录成功 "+evaluation.getDistrictName());
}
Map<String, String> data = new HashMap<String, String>();
data.put("id", String.valueOf(evaluation.getId()));
data.put("role", String.valueOf(fjtUser.getRole()));
JsonModel json = new JsonModel();
json.setJsonModel(data);
return json;
}
@@ -891,7 +931,7 @@ public class WeiXinEvaluationController {
if(StringUtils.isNotBlank(model.getEvaluationId()) && model.getHopePrice()!=null){
BohaiEvaluationAudit evaluationAudit = bohaiEvaluationAuditService.findByBohaiEvaluationAuditId(Long.valueOf(model.getEvaluationId()));
if(evaluationAudit != null){
evaluationAudit.setHopePrice(model.getHopePrice()*10000);
evaluationAudit.setHopePrice((int)(model.getHopePrice()*10000));
evaluationAudit.setLastUpdated(new Date());
evaluationAudit.setAuditStatus(2);
@@ -43,7 +43,7 @@ public class EvaluationModel extends BaseModel{
private Integer role;
private String cardId;
private Map<String, Object> loanInfoMap;
private Integer hopePrice;
private Double hopePrice;
private String remark;
private Integer loan;
// private String preCode;//眾漆諉諳--瞼攫晤鎢
@@ -222,11 +222,11 @@ public class EvaluationModel extends BaseModel{
this.bohaiEvaluationAudit = bohaiEvaluationAudit;
}
public Integer getHopePrice() {
public Double getHopePrice() {
return hopePrice;
}
public void setHopePrice(Integer hopePrice) {
public void setHopePrice(Double hopePrice) {
this.hopePrice = hopePrice;
}
@@ -210,7 +210,7 @@ public class BHBankUtils {
return null;
}
public static String inquireFeedback(String name, String queryId, Integer hopePrice){
public static String inquireFeedback(String name, String queryId, Double hopePrice){
String feedbackId = null;
List<JSONObject> list = new ArrayList<JSONObject>();
Map params = new HashMap();
@@ -252,16 +252,21 @@
async: false,
method: "POST",
success: function (data) {
if (data.id == undefined) {
if(data.msg){
$.toast("估价失败,请重新评估");
$("#evaluateBtn").prop("disabled", false)
} else {
if(data.role == "17"){
location.href = "bhreport?evaluationId=" + data.id
}else{
location.href = "report?evaluationId=" + data.id
}else{
if (data.id == undefined) {
$.toast("估价失败,请重新评估");
$("#evaluateBtn").prop("disabled", false)
} else {
if(data.role == "17"){
location.href = "bhreport?evaluationId=" + data.id
}else{
location.href = "report?evaluationId=" + data.id
}
}
}
},
error: function(XMLHttpRequest){
$.toast("服务器异常,请重新评估");
@@ -38,7 +38,7 @@
<p style="color: #F4A460;font-size: 12px;line-height: 20px;margin-top: -5px;margin-left: 20px;">*请确认与产证地址一致</p>
<span></span>
<#if bohaiEvaluationAudit?? && bohaiEvaluationAudit.auditStatus!=0 && bohaiEvaluationAudit.inquirePrice gt 0>
<p style="margin-top:14px;">评估总价:<#if fjtEvaluation??><strong class="<#if bohaiEvaluationAudit?? && (bohaiEvaluationAudit.lastPrice?? || bohaiEvaluationAudit.inquirePrice??)>price_final</#if>"><#if bohaiEvaluationAudit.lastPrice??>${(bohaiEvaluationAudit.lastPrice/10000)?int}<#elseif bohaiEvaluationAudit.inquirePrice??>${(bohaiEvaluationAudit.inquirePrice/10000)?int}</#if></strong>&nbsp;万元</#if></p>
<p style="margin-top:14px;">评估总价:<#if fjtEvaluation??><strong class="<#if bohaiEvaluationAudit?? && (bohaiEvaluationAudit.lastPrice?? || bohaiEvaluationAudit.inquirePrice??)>price_final</#if>"><#if bohaiEvaluationAudit.lastPrice??>${(bohaiEvaluationAudit.lastPrice/10000)?string('0.##')}<#elseif bohaiEvaluationAudit.inquirePrice??>${(bohaiEvaluationAudit.inquirePrice/10000)?string('0.##')}</#if></strong>&nbsp;万元</#if></p>
<p>评估单价:<#if bohaiEvaluationAudit.lastPrice??>${(bohaiEvaluationAudit.lastPrice/fjtEvaluation.houseArea)?int}<#elseif bohaiEvaluationAudit.inquirePrice??>${(bohaiEvaluationAudit.inquirePrice/fjtEvaluation.houseArea)?int}</#if>&nbsp;元/平米</p>
<#if role?? && role==17 && loanInfoMap??>
<p style="margin-top:-12px;">所属分类:${loanInfoMap.type!}类</p>
@@ -71,15 +71,15 @@
<#if bohaiEvaluationAudit?? && bohaiEvaluationAudit.lastPrice??>
<div class="topic inputTopic01" id="inputTopic01c">
<div class="topicTitle topicTitle01">
<span>审核价:<strong class="price_final">${(bohaiEvaluationAudit.lastPrice!/10000)?int}</strong>&nbsp;万元</span><br>
<span style="display:block;margin-top:-10px;">期望价:${(bohaiEvaluationAudit.hopePrice!/10000)?int}&nbsp;万元</span>
<span>审核价:<strong class="price_final">${(bohaiEvaluationAudit.lastPrice!/10000)?string('0.##')}</strong>&nbsp;万元</span><br>
<span style="display:block;margin-top:-10px;">期望价:${(bohaiEvaluationAudit.hopePrice!/10000)?string('0.##')}&nbsp;万元</span>
</div>
</div>
<#else>
<#if bohaiEvaluationAudit?? && bohaiEvaluationAudit.hopePrice??>
<div class="topic inputTopic01" id="inputTopic01b">
<div class="topicTitle topicTitle01">
<span>期望价:${(bohaiEvaluationAudit.hopePrice!/10000)?int}&nbsp;万元</span>
<span>期望价:${(bohaiEvaluationAudit.hopePrice!/10000)?string('0.##')}&nbsp;万元</span>
<a class="submit_btn" id="refreshbhPrice">刷新</a>
</div>
</div>