From bc3e8e8e453e5f2e9d6500489512391d69f7fa1b Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Thu, 20 Aug 2020 01:03:38 +0800 Subject: [PATCH] fix contract --- .../contract/WxRentContractController.java | 32 +++++++++++-------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java index 248805dcb..1fa173259 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -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 page = wxRentContractService.getRentContractList(wxRentContract, 1, 100000); if (null != page && null != page.getList()) { - List painglist = new ArrayList(); - 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 outdatelist = new ArrayList(); - 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> retList = new ArrayList>(); + for (WxRentContract wr:page.getList()) { + retList.add(wxRentContractService.getById(wr.getId())); } + return new ResultData(retList); + +// List painglist = new ArrayList(); +// 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 outdatelist = new ArrayList(); +// 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(); }