Procházet zdrojové kódy

[招商][客户信息]

release_toaliyun_real
Burce před 6 roky
rodič
revize
2a3a3d4880
3 změnil soubory, kde provedl 9 přidání a 6 odebrání
  1. +0
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestFollowRecordController.java
  2. +3
    -1
      mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestDemandQuery.java
  3. +6
    -3
      mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java

+ 0
- 2
mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestFollowRecordController.java Zobrazit soubor

@@ -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));
}


/**
* 信息
*/


+ 3
- 1
mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestDemandQuery.java Zobrazit soubor

@@ -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<EnumCustomerType> customerType;

/**
* 经营业态


+ 6
- 3
mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java Zobrazit soubor

@@ -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());
}



Načítá se…
Zrušit
Uložit