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 26b7da3ab..976f56390 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 @@ -659,13 +659,13 @@ public class InvestBizServiceImpl implements InvestBizService { InvestPageQuery 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 queryWrapper = new LambdaQueryWrapper<>(); + //remindPageQuery.setQueryData(remindQuery); + LambdaQueryWrapper 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,7 +1066,7 @@ 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() - .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() .eq(InvestRemindEntity::getTenantId, InvestUserContext.getUser().getTenantId()))); @@ -1081,13 +1081,14 @@ public class InvestBizServiceImpl implements InvestBizService { .ge(InvestTaskEntity::getStatus, EnumTaskStatus.CREATED) .apply("`owner` REGEXP {0}", InvestUserContext.getUserId()))); result.put("customerTotal", demandService.count(new LambdaQueryWrapper() - .eq(InvestDemandEntity::getOwner, InvestUserContext.getUser().getTenantId()))); + .eq(InvestDemandEntity::getOwner, InvestUserContext.getUserId()) + .eq(InvestDemandEntity::getIntent, InvestUserContext.getUser().getTenantId()))); result.put("taskToday", taskService.count(new LambdaQueryWrapper() .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() - .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()))); }