diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index 20dd14a58..1b3df48ef 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -260,8 +260,35 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService wxBillRent.setPropertyContractId(id); wxBillRent.setSortColumns(BaseEntity.SortField.Period_ASC); wxBillRent.updateTenantInfo(tenantEntity); - return wxBillPropertyMapper.findList(wxBillRent); - //TODO 1111111 + //一次性的和非一次性的都有这个属性,过滤掉,就是物业主账单 + wxBillRent.setHasFeesStardarsId(EnumYesOrNo.NO.getCode()); + List retList = wxBillPropertyMapper.findList(wxBillRent); + //非一次性的有这个属性 + wxBillRent.setHasParentBillId(EnumYesOrNo.YES.getCode()); + List unFixedList = wxBillPropertyMapper.findList(wxBillRent); + Map> childMap = null; + if (null != unFixedList && unFixedList.size() > 0 ) { + childMap = new HashMap>(); + for (int i = 0 ; i < unFixedList.size(); i++) { + WxBillProperty ub = unFixedList.get(i); + if (null != ub) { + List childList = childMap.get(ub.getParentBillId()); + if (null == childList) { + childList = new ArrayList(); + } + childList.add(ub); + } + } + } + if (null != childMap ) { + for (int i = 0 ; i < retList.size(); i ++) { + WxBillProperty ub = retList.get(i); + List childList = childMap.get(ub.getId()); + ub.setChildList(childList); + } + } + + return retList; } /**