diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxAgileContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxAgileContractServiceImpl.java index 140007d6a..f881c48c6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxAgileContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxAgileContractServiceImpl.java @@ -14,6 +14,7 @@ import com.iformall.domain.po.WxContractCustomers; import com.iformall.domain.po.WxContractShop; import com.iformall.domain.po.WxEnergyFees; import com.iformall.domain.po.WxMerchant; +import com.iformall.domain.po.WxPropertyContract; import com.iformall.domain.po.WxRentContract; import com.iformall.domain.po.WxRentContractAgileDeposit; import com.iformall.domain.po.WxRentContractAgileDepositShop; @@ -135,9 +136,50 @@ public class WxAgileContractServiceImpl implements WxAgileContractService { } } PageInfo pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxRentContractMapper.findList(rentContract)); + if (null != pageInfo && null != pageInfo.getList() && pageInfo.getList().size() > 0 ) { + List customersIdList = new ArrayList(); + for (int i = 0 ; i < pageInfo.getList().size(); i ++ ){ + WxRentContract contract = pageInfo.getList().get(i); + if (null != contract.getCustomersId()) { + customersIdList.add(contract.getCustomersId()); + } + } + + Map customersMap = getContractCustomersMap(record,customersIdList); + + for (int i = 0 ; i < pageInfo.getList().size(); i ++ ) { + WxRentContract contract = pageInfo.getList().get(i); + String merchantName = ""; + if (null != customersMap && null != contract.getCustomersId()) { + WxContractCustomers cc = customersMap.get(contract.getCustomersId()); + if (null != cc) { + merchantName = merchantName + cc.getName(); + } + } + contract.setMerchantName(merchantName); + } + } return pageInfo; } + private Map getContractCustomersMap(TenantEntity tenantEntity,List customerIds) { + WxContractCustomers ccq = new WxContractCustomers(); + ccq.updateTenantInfo(tenantEntity); + ccq.setIds(customerIds); + List cclist = wxContractCustomersMapper.findList(ccq); + if (null != cclist && cclist.size() > 0 ){ + Map map = new HashMap(); + for (int i = 0 ; i < cclist.size() ; i ++ ) { + WxContractCustomers cc = cclist.get(i); + if (null != cc) { + map.put(cc.getId(),cc); + } + } + return map; + } + return null; + } + @Override public WxRentContract selectById(Long id) { 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 0350f7f61..8a27ea743 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -133,7 +133,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService if (null != customersMap && null != contract.getCustomersId()) { WxContractCustomers cc = customersMap.get(contract.getCustomersId()); if (null != cc) { - merchantName = merchantName + cc.getName()+"/"; + merchantName = merchantName + cc.getName(); } } contract.setMerchantName(merchantName); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index e32de81cd..347303d1f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -1732,7 +1732,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { if (null != customersMap && null != contract.getCustomersId()) { WxContractCustomers cc = customersMap.get(contract.getCustomersId()); if (null != cc) { - merchantName = merchantName + cc.getName()+"/"; + merchantName = merchantName + cc.getName(); } } contract.setMerchantName(merchantName);