|
|
|
@@ -85,6 +85,10 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService |
|
|
|
@Lazy |
|
|
|
@Autowired |
|
|
|
WxRentContractService wxRentContractService; |
|
|
|
|
|
|
|
@Lazy |
|
|
|
@Autowired |
|
|
|
WxAgileContractService wxAgileContractService; |
|
|
|
|
|
|
|
@Lazy |
|
|
|
@Autowired |
|
|
|
@@ -108,11 +112,12 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService |
|
|
|
@Override |
|
|
|
public PageInfo<WxPropertyContract> listAsPage(WxPropertyContract record, Integer pageIndex, Integer pageSize) { |
|
|
|
if (StringUtils.isNotBlank(record.getFloorForRule())) { |
|
|
|
List<Long> mids = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule() , null, null,record.getShopTypeForRule(), 0, 0,null); |
|
|
|
if (null == mids || mids.size() <= 0 ) { |
|
|
|
record.setId(-1L); |
|
|
|
List<Long> contractIds = wxAgileContractService.findBuildingFloorContractIds(record, record.getFloorForRule(), null, null, null, 0); |
|
|
|
//List<Long> mids = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule() , null, null,record.getShopTypeForRule(), 0, 0,null); |
|
|
|
if (null == contractIds || contractIds.size() <= 0 ) { |
|
|
|
record.setId(-1L); |
|
|
|
} else { |
|
|
|
record.setMerchantIds(mids); |
|
|
|
record.setIds(contractIds); |
|
|
|
} |
|
|
|
} |
|
|
|
PageInfo<WxPropertyContract> pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxPropertyContractMapper.findList(record)); |
|
|
|
|