|
|
|
@@ -105,6 +105,9 @@ public class InvestBizServiceImpl implements InvestBizService { |
|
|
|
queryWrapperCustomer.in(CollectionUtils.isNotEmpty(demandList), InvestCustomerEntity::getId, getIds(demandList, InvestDemandEntity::getCustomerId)); |
|
|
|
} |
|
|
|
} |
|
|
|
if(CollectionUtils.isNotEmpty(params.getCustomerType())) { |
|
|
|
queryWrapperCustomer.in(InvestCustomerEntity::getType,params.getCustomerType()) ; |
|
|
|
} |
|
|
|
|
|
|
|
queryWrapperCustomer.orderByDesc(InvestCustomerEntity::getCreateDate); |
|
|
|
InvestPageResult<InvestCustomerEntity> customers = customerService.queryPage(buildPageQuery(params, null), queryWrapperCustomer); |
|
|
|
@@ -492,9 +495,9 @@ public class InvestBizServiceImpl implements InvestBizService { |
|
|
|
|
|
|
|
private InvestDemandDto doConvertDemand(InvestDemandQuery params) { |
|
|
|
InvestCustomerEntity customerEntity = null; |
|
|
|
if (ObjectUtils.anyNotNull(params.getCustomerType(), params.getBusinessId())) { |
|
|
|
if (ObjectUtils.anyNotNull(params.getBusinessId())) { |
|
|
|
customerEntity = new InvestCustomerEntity(); |
|
|
|
customerEntity.setType(params.getCustomerType()); |
|
|
|
//customerEntity.setType(params.getCustomerType()); |
|
|
|
customerEntity.setBusinessId(params.getBusinessId()); |
|
|
|
} |
|
|
|
|
|
|
|
@@ -915,7 +918,7 @@ public class InvestBizServiceImpl implements InvestBizService { |
|
|
|
if (Objects.isNull(shop)) { |
|
|
|
return new HashMap<>(); |
|
|
|
} |
|
|
|
return rentContractService.selectRentContractByShopIds(Arrays.asList(shop.getId()), StringUtils.join(shop.getId(), ""), |
|
|
|
return rentContractService.selectRentContractByShopIds(Collections.singletonList(shop.getId()), StringUtils.join(shop.getId(), ""), |
|
|
|
InvestUserContext.getUser().getTenantId()); |
|
|
|
} |
|
|
|
|
|
|
|
|