| | |
|---|
| | | List<TBill> bills = billService.lambdaQuery().orderByDesc(TBill::getPayableFeesTime).list(); |
|---|
| | | for (TContract contract : contractList) { |
|---|
| | | THouse tHouse = houseList.stream().filter(e -> e.getId().equals(contract.getHouseId())).findFirst().orElse(null); |
|---|
| | | TBill bill = bills.stream().filter(e -> e.getContractId().equals(contract.getId())).findFirst().orElse(null); |
|---|
| | | TBill bill = bills.stream().filter(e -> e.getContractId().equals(contract.getId())&&e.getPayFeesStatus().equals("3")).findFirst().orElse(null); |
|---|
| | | if (bill==null){ |
|---|
| | | bill = bills.stream().filter(e -> e.getContractId().equals(contract.getId())).findFirst().orElse(null); |
|---|
| | | } |
|---|
| | | if (tHouse!=null&& bill!=null){ |
|---|
| | | MyHouseVO myToDoVO = new MyHouseVO(); |
|---|
| | | myToDoVO.setHouseAddress(tHouse.getHouseAddress()); |
|---|
| | | myToDoVO.setMonthRent(contract.getMonthRent()); |
|---|
| | | myToDoVO.setPayType(DictUtils.getDictLabel(DictConstants.DICT_TYPE_CONTRACT_PAY_TYPE,contract.getPayType())); |
|---|
| | | myToDoVO.setMonth(bill.getPayFeesTime().getMonth()+""); |
|---|
| | | myToDoVO.setMonth(bill.getPayFeesTime()==null?bill.getPayableFeesTime().getMonth()+"月":bill.getPayFeesTime().getMonth()+"月"); |
|---|
| | | myToDoVO.setHouseArea(tHouse.getHouseArea()); |
|---|
| | | myToDoVO.setHouseType(tHouse.getHouseType()); |
|---|
| | | myToDoVO.setEndTime(DateUtils.localDateTimeToStringYear(contract.getEndTime())); |
|---|
