|
|
|
@@ -289,7 +289,7 @@ public class WxRentContractController extends WxContractBaseController { |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 查询商户计租中的合同 |
|
|
|
* 查询商户计租中或者正常到期的合同 |
|
|
|
* @param wxRentContract |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
@@ -305,19 +305,25 @@ public class WxRentContractController extends WxContractBaseController { |
|
|
|
wxRentContract.setSortColumn(BaseEntity.SortField.Createtime_DESC.getValue()); |
|
|
|
PageInfo<WxRentContract> page = wxRentContractService.getRentContractList(wxRentContract, 1, 100000); |
|
|
|
if (null != page && null != page.getList()) { |
|
|
|
List<WxRentContract> painglist = new ArrayList<WxRentContract>(); |
|
|
|
painglist.addAll(page.getList()); |
|
|
|
painglist.stream().filter( p -> p.getStatus().intValue()==EnumRentContractStatus.PAING.getCode().intValue()); |
|
|
|
if (painglist.size()>0) { |
|
|
|
return new ResultData(wxRentContractService.getById(painglist.get(0).getId())); |
|
|
|
}else { |
|
|
|
List<WxRentContract> outdatelist = new ArrayList<WxRentContract>(); |
|
|
|
outdatelist.addAll(page.getList()); |
|
|
|
outdatelist.stream().filter( p -> p.getStatus().intValue()==EnumRentContractStatus.OUT_DATE.getCode().intValue()); |
|
|
|
if (outdatelist.size() > 0 ) { |
|
|
|
return new ResultData(wxRentContractService.getById(outdatelist.get(0).getId())); |
|
|
|
} |
|
|
|
List<Map<String, Object>> retList = new ArrayList<Map<String, Object>>(); |
|
|
|
for (WxRentContract wr:page.getList()) { |
|
|
|
retList.add(wxRentContractService.getById(wr.getId())); |
|
|
|
} |
|
|
|
return new ResultData(retList); |
|
|
|
|
|
|
|
// List<WxRentContract> painglist = new ArrayList<WxRentContract>(); |
|
|
|
// painglist.addAll(page.getList()); |
|
|
|
// painglist.stream().filter( p -> p.getStatus().intValue()==EnumRentContractStatus.PAING.getCode().intValue()); |
|
|
|
// if (painglist.size()>0) { |
|
|
|
// return new ResultData(wxRentContractService.getById(painglist.get(0).getId())); |
|
|
|
// }else { |
|
|
|
// List<WxRentContract> outdatelist = new ArrayList<WxRentContract>(); |
|
|
|
// outdatelist.addAll(page.getList()); |
|
|
|
// outdatelist.stream().filter( p -> p.getStatus().intValue()==EnumRentContractStatus.OUT_DATE.getCode().intValue()); |
|
|
|
// if (outdatelist.size() > 0 ) { |
|
|
|
// return new ResultData(wxRentContractService.getById(outdatelist.get(0).getId())); |
|
|
|
// } |
|
|
|
// } |
|
|
|
} |
|
|
|
return new ResultData(); |
|
|
|
} |
|
|
|
|