Browse Source

[合同模板][修改][数据显示问题]

release_toaliyun_real
gongbiao 7 years ago
parent
commit
720a5774f7
1 changed files with 14 additions and 12 deletions
  1. +14
    -12
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

+ 14
- 12
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java View File

@@ -1547,17 +1547,17 @@ public class WxRentContractServiceImpl implements WxRentContractService {
int index = 10 - paycount;
int count = paycount - 1;
BigDecimal rentPrice = new BigDecimal(priceRent);
//保底
if (wxRentContract.getRevenue() != null) {
double revenue = new BigDecimal(wxRentContract.getRevenue())
.divide(new BigDecimal(100)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
result.put("revenue", revenue);
result.put("revenueUpper", digitUppercase(revenue));
} else {
result.put("revenue", 0);
result.put("revenueUpper", digitUppercase(0));
}
if (!wxRentContract.getType().equals(EnumRentContractType.RENT_BY_JOINT.getCode())) {
//保底
if (wxRentContract.getRevenue() != null) {
double revenue = new BigDecimal(wxRentContract.getRevenue())
.divide(new BigDecimal(100)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
result.put("revenue", revenue);
result.put("revenueUpper", digitUppercase(revenue));
} else {
result.put("revenue", 0);
result.put("revenueUpper", digitUppercase(0));
}
areaWay(wxRentContract, result, lease, extralease, extracount, paycount, index, count, rentPrice);
} else {
ratioWay(wxRentContract, result, lease, extralease, extracount, paycount, index, count, rentPrice);
@@ -1683,7 +1683,8 @@ public class WxRentContractServiceImpl implements WxRentContractService {
String ratio = new BigDecimal(integers.get(i)).divide(new BigDecimal(100)).toPlainString();
result.put("adjustRatio" + i, ratio);
result.put("adjustPeriod" + i, wxRentContract.getAdjustPeriod());
result.put("payRatio" + i, wxRentContract.getPayRatio());
String payRatio = new BigDecimal(wxRentContract.getPayRatio()).divide(new BigDecimal(100)).toPlainString();
result.put("payRatio" + i, payRatio);

}
if (extracount > 0) {
@@ -1711,7 +1712,8 @@ public class WxRentContractServiceImpl implements WxRentContractService {
result.put("rentalEndDateDay" + count, enddate.substring(8));
result.put("adjustRatio" + count, wxRentContract.getAdjustRatio());
result.put("adjustPeriod" + count, wxRentContract.getAdjustPeriod());
result.put("payRatio" + count, wxRentContract.getPayRatio());
String payRatio = new BigDecimal(wxRentContract.getPayRatio()).divide(new BigDecimal(100)).toPlainString();
result.put("payRatio" + count, payRatio);

}
//无数据租期


Loading…
Cancel
Save