Преглед изворни кода

rent

release_toaliyun_real
xhxu пре 5 година
родитељ
комит
c2cda0c4b4
2 измењених фајлова са 4 додато и 1 уклоњено
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxBillRent.java
  2. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

+ 1
- 1
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") @io.swagger.annotations.ApiModelProperty(value = "合同应收明细", name = "rentPriceInfo")
private String rentPriceInfo; private String rentPriceInfo;


@Excel(name = "原合同应收金额明细", width = 20, orderNum = "7")
@Excel(name = "原合同应收金额明细", width = 20, height = 30, orderNum = "7")
@TableField(exist = false) @TableField(exist = false)
private String rentPriceInfoStr; private String rentPriceInfoStr;
public String getRentPriceInfoStr() { public String getRentPriceInfoStr() {


+ 3
- 0
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){ private String getRentPriceInfo(WxRentContract wxRentContract, long contractNeedPay){
if(contractNeedPay == 0l){
return null;
}
long rentPrice = 0l, siteMoney = 0l, facilityMoney = 0l, administratorMoney = 0l; long rentPrice = 0l, siteMoney = 0l, facilityMoney = 0l, administratorMoney = 0l;
if(!wxRentContract.getType().equals(EnumRentContractType.RENT_BY_JOINT.getCode()) && if(!wxRentContract.getType().equals(EnumRentContractType.RENT_BY_JOINT.getCode()) &&
!wxRentContract.getType().equals(EnumRentContractType.RENT_BY_COUNT.getCode())){ !wxRentContract.getType().equals(EnumRentContractType.RENT_BY_COUNT.getCode())){


Loading…
Откажи
Сачувај