| @@ -837,35 +837,38 @@ 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); | ||||
| if (null == billList || billList.size() <= 0 ) { | |||||
| return new ResultData(); | |||||
| } | |||||
| List<WxAllBill> validBillList = new ArrayList<WxAllBill>(); | List<WxAllBill> validBillList = new ArrayList<WxAllBill>(); | ||||
| WxRentContract rc = new WxRentContract(); | WxRentContract rc = new WxRentContract(); | ||||
| rc.updateTenantInfo(sales); | rc.updateTenantInfo(sales); | ||||
| rc.setId(sales.getRentContractId()); | rc.setId(sales.getRentContractId()); | ||||
| List<WxRentContractRevenueSales> salesList = wxRentContractService.getContractSales(rc); | List<WxRentContractRevenueSales> salesList = wxRentContractService.getContractSales(rc); | ||||
| if (null != salesList && salesList.size() > 0 && null != billList && billList.size() > 0 ) { | |||||
| Map<Long,WxRentContractRevenueSales> billSalesMap = new HashMap<Long,WxRentContractRevenueSales>(); | |||||
| Map<Long,WxRentContractRevenueSales> billSalesMap = new HashMap<Long,WxRentContractRevenueSales>(); | |||||
| if (null != salesList && salesList.size() > 0) { | |||||
| for (int i = 0 ; i < salesList.size() ; i ++ ) { | for (int i = 0 ; i < salesList.size() ; i ++ ) { | ||||
| WxRentContractRevenueSales rs = salesList.get(i); | WxRentContractRevenueSales rs = salesList.get(i); | ||||
| billSalesMap.put(rs.getBillId(), rs); | billSalesMap.put(rs.getBillId(), rs); | ||||
| } | } | ||||
| for (int i = 0 ; i < billList.size() ; i ++) { | |||||
| WxAllBill bill = billList.get(i); | |||||
| WxRentContractRevenueSales s = billSalesMap.get(bill.getId()); | |||||
| 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); | |||||
| } | |||||
| } | |||||
| } | } | ||||
| for (int i = 0 ; i < billList.size() ; i ++) { | |||||
| WxAllBill bill = billList.get(i); | |||||
| WxRentContractRevenueSales s = billSalesMap.get(bill.getId()); | |||||
| 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(validBillList); | return new ResultData(validBillList); | ||||
| } | } | ||||