From c2cda0c4b4ed95c6ad759f0f129edcd81cb5aaf6 Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 23 Mar 2021 15:02:32 +0800 Subject: [PATCH] rent --- .../src/main/java/com/iformall/domain/po/WxBillRent.java | 2 +- .../com/iformall/service/impl/WxRentContractServiceImpl.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java index 506c83aea..94108b1da 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java @@ -101,7 +101,7 @@ public class WxBillRent extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "合同应收明细", name = "rentPriceInfo") private String rentPriceInfo; - @Excel(name = "原合同应收金额明细", width = 20, orderNum = "7") + @Excel(name = "原合同应收金额明细", width = 20, height = 30, orderNum = "7") @TableField(exist = false) private String rentPriceInfoStr; public String getRentPriceInfoStr() { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 2c69f47ef..601b15858 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -1178,6 +1178,9 @@ public class WxRentContractServiceImpl implements WxRentContractService { } private String getRentPriceInfo(WxRentContract wxRentContract, long contractNeedPay){ + if(contractNeedPay == 0l){ + return null; + } long rentPrice = 0l, siteMoney = 0l, facilityMoney = 0l, administratorMoney = 0l; if(!wxRentContract.getType().equals(EnumRentContractType.RENT_BY_JOINT.getCode()) && !wxRentContract.getType().equals(EnumRentContractType.RENT_BY_COUNT.getCode())){