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