瀏覽代碼

fix

release_toaliyun_real
winter 1 年之前
父節點
當前提交
dbbd6ed449
共有 1 個檔案被更改,包括 9 行新增2 行删除
  1. +9
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java

+ 9
- 2
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java 查看文件

@@ -837,6 +837,7 @@ public class WxRentContractController extends WxContractBaseController {
bq.setNoExtraCreateFrom(EnumYesOrNo.YES.getCode());
bq.setSortColumn(" starttime asc");
List<WxAllBill> billList = wxAllBillService.list(bq);
List<WxAllBill> validBillList = new ArrayList<WxAllBill>();
WxRentContract rc = new WxRentContract();
rc.updateTenantInfo(sales);
@@ -855,11 +856,17 @@ public class WxRentContractController extends WxContractBaseController {
if (null != s) {
bill.setSales(s.getSaleMoney());
bill.setSalesTime(s.getUpdateTime());
if (s.getIsConfirm() == EnumYesOrNo.YES.getCode()) {
//
}else {
validBillList.add(bill);
}
}else {
validBillList.add(bill);
}
}
}
return new ResultData(billList);
return new ResultData(validBillList);
}
//查询商户计租合同列表


Loading…
取消
儲存