Sfoglia il codice sorgente

[招商]adjust

release_toaliyun_real
Burce 6 anni fa
parent
commit
6db2e76384
3 ha cambiato i file con 6 aggiunte e 6 eliminazioni
  1. +0
    -2
      mallinkService/src/main/java/com/iformall/domain/po/invest/InvestCustomerEntity.java
  2. +0
    -1
      mallinkService/src/main/java/com/iformall/domain/po/invest/InvestDemandEntity.java
  3. +6
    -3
      mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java

+ 0
- 2
mallinkService/src/main/java/com/iformall/domain/po/invest/InvestCustomerEntity.java Vedi File

@@ -60,14 +60,12 @@ public class InvestCustomerEntity extends InvestBaseEntity {
*/ */
@io.swagger.annotations.ApiModelProperty(value = "客户分类:0-潜在客户;1-意向客户;2-合作客户;3-谈判失败", name = "type") @io.swagger.annotations.ApiModelProperty(value = "客户分类:0-潜在客户;1-意向客户;2-合作客户;3-谈判失败", name = "type")
@LogColumn @LogColumn
@TableField(strategy = FieldStrategy.IGNORED)
private EnumCustomerType type; private EnumCustomerType type;
/** /**
* 客户预评级:0-无;1-主力店;2-次主力店;3-甲;4-乙;5-丙 * 客户预评级:0-无;1-主力店;2-次主力店;3-甲;4-乙;5-丙
*/ */
@io.swagger.annotations.ApiModelProperty(value = "客户预评级:0-无;1-主力店;2-次主力店;3-甲;4-乙;5-丙", name = "rating") @io.swagger.annotations.ApiModelProperty(value = "客户预评级:0-无;1-主力店;2-次主力店;3-甲;4-乙;5-丙", name = "rating")
@LogColumn @LogColumn
@TableField(strategy = FieldStrategy.IGNORED)
private EnumCustomerRatingType rating; private EnumCustomerRatingType rating;


/** /**


+ 0
- 1
mallinkService/src/main/java/com/iformall/domain/po/invest/InvestDemandEntity.java Vedi File

@@ -34,7 +34,6 @@ public class InvestDemandEntity extends InvestBaseEntity {
*/ */
@io.swagger.annotations.ApiModelProperty(value = "负责人", name = "owner") @io.swagger.annotations.ApiModelProperty(value = "负责人", name = "owner")
@LogColumn @LogColumn
@TableField(strategy = FieldStrategy.IGNORED)
private Long owner; private Long owner;
/** /**
* 客户ID * 客户ID


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

@@ -93,13 +93,16 @@ public class InvestBizServiceImpl implements InvestBizService {
List<InvestDemandEntity> demandList = demandService.list(new LambdaQueryWrapper<>(demandParams)); List<InvestDemandEntity> demandList = demandService.list(new LambdaQueryWrapper<>(demandParams));
LambdaQueryWrapper<InvestCustomerEntity> queryWrapperCustomer = new LambdaQueryWrapper<>(customerParams); LambdaQueryWrapper<InvestCustomerEntity> queryWrapperCustomer = new LambdaQueryWrapper<>(customerParams);
if (Objects.isNull(InvestUserContext.getDataUser())) { if (Objects.isNull(InvestUserContext.getDataUser())) {
queryWrapperCustomer.in(ObjectUtils.allNotNull(params.getDemandOwner()),
InvestCustomerEntity::getId, getIds(demandList, InvestDemandEntity::getCustomerId));
if (CollectionUtils.isEmpty(demandList) && Objects.nonNull(params.getDemandOwner())) {
return investPage;
} else {
queryWrapperCustomer.in(CollectionUtils.isNotEmpty(demandList),InvestCustomerEntity::getId, getIds(demandList, InvestDemandEntity::getCustomerId));
}
} else { } else {
if (CollectionUtils.isEmpty(demandList)) { if (CollectionUtils.isEmpty(demandList)) {
return investPage; return investPage;
} else { } else {
queryWrapperCustomer.in(InvestCustomerEntity::getId, getIds(demandList, InvestDemandEntity::getCustomerId));
queryWrapperCustomer.in(CollectionUtils.isNotEmpty(demandList),InvestCustomerEntity::getId, getIds(demandList, InvestDemandEntity::getCustomerId));
} }
} }
queryWrapperCustomer.orderByDesc(InvestCustomerEntity::getCreateDate); queryWrapperCustomer.orderByDesc(InvestCustomerEntity::getCreateDate);


Caricamento…
Annulla
Salva