| @@ -659,13 +659,13 @@ public class InvestBizServiceImpl implements InvestBizService { | |||||
| InvestPageQuery<InvestRemindEntity> remindPageQuery = new InvestPageQuery<>(); | InvestPageQuery<InvestRemindEntity> remindPageQuery = new InvestPageQuery<>(); | ||||
| BeanUtils.copyProperties(params, remindPageQuery); | BeanUtils.copyProperties(params, remindPageQuery); | ||||
| InvestRemindEntity remindQuery = new InvestRemindEntity(); | InvestRemindEntity remindQuery = new InvestRemindEntity(); | ||||
| if (Objects.isNull(params.getOwnerId())) { | |||||
| if (Objects.nonNull(InvestUserContext.getDataUser()) && Objects.isNull(params.getOwnerId())) { | |||||
| remindQuery.setOwner(InvestUserContext.getDataUser()); | remindQuery.setOwner(InvestUserContext.getDataUser()); | ||||
| } else { | } else { | ||||
| remindQuery.setOwner(params.getOwnerId()); | 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()); | queryWrapper.eq(InvestRemindEntity::getTenantId, InvestUserContext.getUser().getTenantId()); | ||||
| if (Objects.nonNull(params.getRemindDate())) { | if (Objects.nonNull(params.getRemindDate())) { | ||||
| queryWrapper.apply("date_format(begin_date,'%Y-%m-%d') <= {0}", getDayStart(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())) | .apply("date_format(create_date,'%Y-%m-%d') = {0}", DateUtils.format(new Date())) | ||||
| .eq(InvestCustomerEntity::getTenantId, InvestUserContext.getUser().getTenantId()))); | .eq(InvestCustomerEntity::getTenantId, InvestUserContext.getUser().getTenantId()))); | ||||
| result.put("customerImportant", customerService.count(new LambdaQueryWrapper<InvestCustomerEntity>() | 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()))); | .eq(InvestCustomerEntity::getTenantId, InvestUserContext.getUser().getTenantId()))); | ||||
| result.put("remindTotal", remindService.count(new LambdaQueryWrapper<InvestRemindEntity>() | result.put("remindTotal", remindService.count(new LambdaQueryWrapper<InvestRemindEntity>() | ||||
| .eq(InvestRemindEntity::getTenantId, InvestUserContext.getUser().getTenantId()))); | .eq(InvestRemindEntity::getTenantId, InvestUserContext.getUser().getTenantId()))); | ||||
| @@ -1081,13 +1081,14 @@ public class InvestBizServiceImpl implements InvestBizService { | |||||
| .ge(InvestTaskEntity::getStatus, EnumTaskStatus.CREATED) | .ge(InvestTaskEntity::getStatus, EnumTaskStatus.CREATED) | ||||
| .apply("`owner` REGEXP {0}", InvestUserContext.getUserId()))); | .apply("`owner` REGEXP {0}", InvestUserContext.getUserId()))); | ||||
| result.put("customerTotal", demandService.count(new LambdaQueryWrapper<InvestDemandEntity>() | result.put("customerTotal", demandService.count(new LambdaQueryWrapper<InvestDemandEntity>() | ||||
| .eq(InvestDemandEntity::getOwner, InvestUserContext.getUser().getTenantId()))); | |||||
| .eq(InvestDemandEntity::getOwner, InvestUserContext.getUserId()) | |||||
| .eq(InvestDemandEntity::getIntent, InvestUserContext.getUser().getTenantId()))); | |||||
| result.put("taskToday", taskService.count(new LambdaQueryWrapper<InvestTaskEntity>() | result.put("taskToday", taskService.count(new LambdaQueryWrapper<InvestTaskEntity>() | ||||
| .apply("`owner` REGEXP {0}", InvestUserContext.getUserId()) | .apply("`owner` REGEXP {0}", InvestUserContext.getUserId()) | ||||
| .apply("date_format(create_date,'%Y-%m-%d') = {0}", DateUtils.format(new Date())) | .apply("date_format(create_date,'%Y-%m-%d') = {0}", DateUtils.format(new Date())) | ||||
| .eq(InvestTaskEntity::getTenantId, InvestUserContext.getUser().getTenantId()))); | .eq(InvestTaskEntity::getTenantId, InvestUserContext.getUser().getTenantId()))); | ||||
| result.put("customerToday", demandService.count(new LambdaQueryWrapper<InvestDemandEntity>() | 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())) | .apply("date_format(create_date,'%Y-%m-%d') = {0}", DateUtils.format(new Date())) | ||||
| .eq(InvestDemandEntity::getTenantId, InvestUserContext.getUser().getTenantId()))); | .eq(InvestDemandEntity::getTenantId, InvestUserContext.getUser().getTenantId()))); | ||||
| } | } | ||||