From 2a3a3d4880bd74c5bccd135a109fa88facd07420 Mon Sep 17 00:00:00 2001 From: Burce Date: Thu, 31 Oct 2019 17:25:21 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=8B=9B=E5=95=86][=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E4=BF=A1=E6=81=AF]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/invest/InvestFollowRecordController.java | 2 -- .../com/iformall/domain/vo/invest/InvestDemandQuery.java | 4 +++- .../service/invest/impl/InvestBizServiceImpl.java | 9 ++++++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestFollowRecordController.java b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestFollowRecordController.java index 02566d3e4..a97f02fdb 100755 --- a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestFollowRecordController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestFollowRecordController.java @@ -17,7 +17,6 @@ import org.springframework.web.bind.annotation.*; import java.util.Arrays; - /** * 招商模块-跟踪记录 * @@ -45,7 +44,6 @@ public class InvestFollowRecordController extends InvestBaseController { return execute(params, p -> bizService.queryPageFollowRecord(p)); } - /** * 信息 */ diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestDemandQuery.java b/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestDemandQuery.java index 3d8629a58..7841b32d5 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestDemandQuery.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestDemandQuery.java @@ -4,6 +4,8 @@ import com.iformall.enums.EnumCustomerType; import lombok.Data; import lombok.EqualsAndHashCode; +import java.util.List; + @Data @EqualsAndHashCode(callSuper = true) public class InvestDemandQuery extends InvestPageQuery { @@ -18,7 +20,7 @@ public class InvestDemandQuery extends InvestPageQuery { * 客户分类:0-潜在客户;1-意向客户;2-合作客户;3-谈判失败 */ @io.swagger.annotations.ApiModelProperty(value = "客户分类:0-潜在客户;1-意向客户;2-合作客户;3-谈判失败", name = "customerType") - private EnumCustomerType customerType; + private List customerType; /** * 经营业态 diff --git a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java index f88d006ac..c2572b2f4 100644 --- a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java @@ -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 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()); }