diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java b/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java index 456bd120d..099dca5fd 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java @@ -349,5 +349,7 @@ public class WxPropertyContract extends TenantEntity { @TableField(exist = false) private Long queryShopId; + @TableField(exist = false) + private String merchantName; } 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 11e7a885b..0350f7f61 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -116,9 +116,50 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService } } PageInfo pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxPropertyContractMapper.findList(record)); + if (null != pageInfo && null != pageInfo.getList() && pageInfo.getList().size() > 0 ) { + List customersIdList = new ArrayList(); + for (int i = 0 ; i < pageInfo.getList().size(); i ++ ){ + WxPropertyContract 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 ++ ) { + WxPropertyContract 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 List findList(WxPropertyContract record) { return wxPropertyContractMapper.findList(record); 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 1e47e195f..e32de81cd 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -1735,7 +1735,6 @@ public class WxRentContractServiceImpl implements WxRentContractService { merchantName = merchantName + cc.getName()+"/"; } } - merchantName = merchantName + contract.getRentInfoShopNumber(); contract.setMerchantName(merchantName); }