From 0f63ac355e7dc788f5faf1c5e279bbc8888bd2fd Mon Sep 17 00:00:00 2001 From: winter <664946893@qq.com> Date: Fri, 22 Nov 2024 19:05:48 +0800 Subject: [PATCH] fix --- .../impl/WxAgileContractServiceImpl.java | 33 +++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) 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 f82b87efe..6692526bb 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxAgileContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxAgileContractServiceImpl.java @@ -127,8 +127,25 @@ public class WxAgileContractServiceImpl implements WxAgileContractService { @Override public PageInfo getRentContractList(WxRentContract rentContract, Integer pageIndex, Integer pageSize) { - if (StringUtils.isNoneBlank(rentContract.getFloorForRule())) { - List contractIds = this.findBuildingFloorContractIds(rentContract, rentContract.getFloorForRule(), null, null, null, 0); + if (StringUtils.isNotBlank(rentContract.getFloorForRule()) || StringUtils.isNotBlank(rentContract.getQueryShopIdStr())) { + List shopIdList = null; + if (StringUtils.isNotBlank(rentContract.getQueryShopIdStr())) { + String[] qsids = rentContract.getQueryShopIdStr().split(","); + if (null != qsids && qsids.length > 0 ) { + shopIdList = new ArrayList(); + for (int i = 0 ; i < qsids.length ; i ++) { + String qsid = qsids[i]; + if (StringUtils.isNotBlank(qsid)) { + shopIdList.add(Long.parseLong(qsid)); + } + } + if (shopIdList.size() <= 0 ) { + shopIdList = null; + } + } + } + + List contractIds = this.findBuildingFloorContractIds(rentContract, rentContract.getFloorForRule(), null, null, shopIdList, 0); //List mids = wxMerchantService.getFloorBuildMerchantIds(rentContract, rentContract.getFloorForRule() , null, null,rentContract.getShopTypeForRule(), 0, 0,null); if (null == contractIds || contractIds.size() <= 0 ) { rentContract.setId(-1L); @@ -136,6 +153,18 @@ public class WxAgileContractServiceImpl implements WxAgileContractService { rentContract.setIds(contractIds); } } + //根据客户名称查询 + if (StringUtils.isNotBlank(rentContract.getMerchantName())) { + WxContractCustomers ccq = new WxContractCustomers(); + ccq.updateTenantInfo(rentContract); + ccq.setName(rentContract.getMerchantName()); + List customersIdList = wxContractCustomersMapper.findIdList(ccq); + if (null != customersIdList && customersIdList.size() > 0 ) { + rentContract.setCustomersIdList(customersIdList); + }else { + rentContract.setId(-1L); + } + } PageInfo pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxRentContractMapper.findList(rentContract)); if (null != pageInfo && null != pageInfo.getList() && pageInfo.getList().size() > 0 ) { List customersIdList = new ArrayList();