Просмотр исходного кода

Merge tag 'jenkins-back-end-3145' into release

develop
release_toaliyun_real
Burce 6 лет назад
Родитель
Сommit
70bca54aba
5 измененных файлов: 24 добавлений и 11 удалений
  1. +1
    -0
      mallinkService/src/main/java/com/iformall/mapper/InvestCustomerMapper.java
  2. +1
    -0
      mallinkService/src/main/java/com/iformall/service/invest/InvestCustomerService.java
  3. +10
    -11
      mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java
  4. +5
    -0
      mallinkService/src/main/java/com/iformall/service/invest/impl/InvestCustomerServiceImpl.java
  5. +7
    -0
      mallinkService/src/main/resources/mapper/InvestCustomerMapper.xml

+ 1
- 0
mallinkService/src/main/java/com/iformall/mapper/InvestCustomerMapper.java Просмотреть файл

@@ -21,4 +21,5 @@ import java.util.List;
public interface InvestCustomerMapper extends BaseMapper<InvestCustomerEntity> {

List<InvestCustomerVo> listByIds(Collection<? extends Serializable> ids, List<EnumCustomerType> type) ;
int countCustomerUnassigned(String tenantId) ;
}

+ 1
- 0
mallinkService/src/main/java/com/iformall/service/invest/InvestCustomerService.java Просмотреть файл

@@ -24,5 +24,6 @@ public interface InvestCustomerService extends IService<InvestCustomerEntity>,In

List<InvestCustomerVo> listByIds(Collection<? extends Serializable> idList, List<EnumCustomerType> type) ;

int countCustomerUnassigned(String tenantId) ;
}


+ 10
- 11
mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java Просмотреть файл

@@ -156,7 +156,7 @@ public class InvestBizServiceImpl implements InvestBizService {
item.setShopNumber("A10092");
item.setBrandName("肯德基");
item.setName("张三");
item.setPhone("1358888888");
item.setPhone("13588888888");
item.setOpeningTime("2019-01-01");
resultList.add(item);
excelService.exportExcel(resultList, null, "客户信息模板", InvestCustomerVo.class, "客户信息模板.xlsx", response, true);
@@ -493,7 +493,7 @@ public class InvestBizServiceImpl implements InvestBizService {
}

InvestDemandEntity demandEntity = new InvestDemandEntity();
if (ObjectUtils.anyNotNull(params.getDemandOwner())) {
if (Objects.isNull(InvestUserContext.getDataUser())) {
demandEntity.setOwner(params.getDemandOwner());
} else {
demandEntity.setOwner(InvestUserContext.getDataUser());
@@ -659,13 +659,13 @@ public class InvestBizServiceImpl implements InvestBizService {
InvestPageQuery<InvestRemindEntity> remindPageQuery = new InvestPageQuery<>();
BeanUtils.copyProperties(params, remindPageQuery);
InvestRemindEntity remindQuery = new InvestRemindEntity();
if (Objects.isNull(params.getOwnerId())) {
if (Objects.nonNull(InvestUserContext.getDataUser()) && Objects.isNull(params.getOwnerId())) {
remindQuery.setOwner(InvestUserContext.getDataUser());
} else {
remindQuery.setOwner(params.getOwnerId());
}
remindPageQuery.setQueryData(remindQuery);
LambdaQueryWrapper<InvestRemindEntity> queryWrapper = new LambdaQueryWrapper<>();
//remindPageQuery.setQueryData(remindQuery);
LambdaQueryWrapper<InvestRemindEntity> queryWrapper = new LambdaQueryWrapper<>(remindQuery);
queryWrapper.eq(InvestRemindEntity::getTenantId, InvestUserContext.getUser().getTenantId());
if (Objects.nonNull(params.getRemindDate())) {
queryWrapper.apply("date_format(begin_date,'%Y-%m-%d') <= {0}", getDayStart(params.getRemindDate()))
@@ -1066,28 +1066,27 @@ public class InvestBizServiceImpl implements InvestBizService {
.apply("date_format(create_date,'%Y-%m-%d') = {0}", DateUtils.format(new Date()))
.eq(InvestCustomerEntity::getTenantId, InvestUserContext.getUser().getTenantId())));
result.put("customerImportant", customerService.count(new LambdaQueryWrapper<InvestCustomerEntity>()
.in(InvestCustomerEntity::getType, EnumCustomerType.POTENTIAL,EnumCustomerType.INTENTIONAL)
.eq(InvestCustomerEntity::getType, EnumCustomerType.INTENTIONAL)
.eq(InvestCustomerEntity::getTenantId, InvestUserContext.getUser().getTenantId())));
result.put("remindTotal", remindService.count(new LambdaQueryWrapper<InvestRemindEntity>()
.eq(InvestRemindEntity::getTenantId, InvestUserContext.getUser().getTenantId())));
result.put("taskUnassigned", taskService.count(new LambdaQueryWrapper<InvestTaskEntity>()
.eq(InvestTaskEntity::getStatus, EnumTaskStatus.CREATED)
.eq(InvestTaskEntity::getTenantId, InvestUserContext.getUser().getTenantId())));
result.put("customerUnassigned", demandService.count(new LambdaQueryWrapper<InvestDemandEntity>()
.eq(InvestDemandEntity::getTenantId, InvestUserContext.getUser().getTenantId())
.eq(InvestDemandEntity::getOwner, 0L)));
result.put("customerUnassigned", customerService.countCustomerUnassigned(InvestUserContext.getUser().getTenantId()));
} else {
result.put("taskTotal", taskService.count(new LambdaQueryWrapper<InvestTaskEntity>()
.ge(InvestTaskEntity::getStatus, EnumTaskStatus.CREATED)
.apply("`owner` REGEXP {0}", InvestUserContext.getUserId())));
result.put("customerTotal", demandService.count(new LambdaQueryWrapper<InvestDemandEntity>()
.eq(InvestDemandEntity::getOwner, InvestUserContext.getUser().getTenantId())));
.eq(InvestDemandEntity::getOwner, InvestUserContext.getUserId())
.eq(InvestDemandEntity::getTenantId, InvestUserContext.getUser().getTenantId())));
result.put("taskToday", taskService.count(new LambdaQueryWrapper<InvestTaskEntity>()
.apply("`owner` REGEXP {0}", InvestUserContext.getUserId())
.apply("date_format(create_date,'%Y-%m-%d') = {0}", DateUtils.format(new Date()))
.eq(InvestTaskEntity::getTenantId, InvestUserContext.getUser().getTenantId())));
result.put("customerToday", demandService.count(new LambdaQueryWrapper<InvestDemandEntity>()
.eq(InvestDemandEntity::getOwner, InvestUserContext.getUser().getTenantId())
.eq(InvestDemandEntity::getOwner, InvestUserContext.getUserId())
.apply("date_format(create_date,'%Y-%m-%d') = {0}", DateUtils.format(new Date()))
.eq(InvestDemandEntity::getTenantId, InvestUserContext.getUser().getTenantId())));
}


+ 5
- 0
mallinkService/src/main/java/com/iformall/service/invest/impl/InvestCustomerServiceImpl.java Просмотреть файл

@@ -89,4 +89,9 @@ public class InvestCustomerServiceImpl extends InvestBaseServiceImpl<InvestCusto
public List<InvestCustomerVo> listByIds(Collection<? extends Serializable> idList, List<EnumCustomerType> type) {
return super.baseMapper.listByIds(idList,type);
}

@Override
public int countCustomerUnassigned(String tenantId) {
return super.baseMapper.countCustomerUnassigned(tenantId);
}
}

+ 7
- 0
mallinkService/src/main/resources/mapper/InvestCustomerMapper.xml Просмотреть файл

@@ -38,5 +38,12 @@
</foreach>
</if>
</select>
<select id="countCustomerUnassigned" resultType="int">
SELECT count(1)
FROM `invest_customer` c
INNER JOIN `invest_demand` d ON d.`customer_id` = c.id
WHERE d.`owner` = 0
AND c.`tenant_id` = #{tenantId};
</select>

</mapper>

Загрузка…
Отмена
Сохранить