diff --git a/mallinkService/src/main/java/com/iformall/mapper/InvestCustomerMapper.java b/mallinkService/src/main/java/com/iformall/mapper/InvestCustomerMapper.java index 4081a2050..00226b1b1 100755 --- a/mallinkService/src/main/java/com/iformall/mapper/InvestCustomerMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/InvestCustomerMapper.java @@ -21,4 +21,5 @@ import java.util.List; public interface InvestCustomerMapper extends BaseMapper { List listByIds(Collection ids, List type) ; + int countCustomerUnassigned(String tenantId) ; } diff --git a/mallinkService/src/main/java/com/iformall/service/invest/InvestCustomerService.java b/mallinkService/src/main/java/com/iformall/service/invest/InvestCustomerService.java index cd7cf55bb..2d70b873b 100755 --- a/mallinkService/src/main/java/com/iformall/service/invest/InvestCustomerService.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/InvestCustomerService.java @@ -24,5 +24,6 @@ public interface InvestCustomerService extends IService,In List listByIds(Collection idList, List type) ; + int countCustomerUnassigned(String tenantId) ; } 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 f5ae81468..91cd0b132 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 @@ -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()); @@ -1073,9 +1073,7 @@ public class InvestBizServiceImpl implements InvestBizService { result.put("taskUnassigned", taskService.count(new LambdaQueryWrapper() .eq(InvestTaskEntity::getStatus, EnumTaskStatus.CREATED) .eq(InvestTaskEntity::getTenantId, InvestUserContext.getUser().getTenantId()))); - result.put("customerUnassigned", demandService.count(new LambdaQueryWrapper() - .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() .ge(InvestTaskEntity::getStatus, EnumTaskStatus.CREATED) diff --git a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestCustomerServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestCustomerServiceImpl.java index 4a5f15dc8..9f3da6fe6 100755 --- a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestCustomerServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestCustomerServiceImpl.java @@ -89,4 +89,9 @@ public class InvestCustomerServiceImpl extends InvestBaseServiceImpl listByIds(Collection idList, List type) { return super.baseMapper.listByIds(idList,type); } + + @Override + public int countCustomerUnassigned(String tenantId) { + return super.baseMapper.countCustomerUnassigned(tenantId); + } } diff --git a/mallinkService/src/main/resources/mapper/InvestCustomerMapper.xml b/mallinkService/src/main/resources/mapper/InvestCustomerMapper.xml index 78f03f492..98b74e1d8 100644 --- a/mallinkService/src/main/resources/mapper/InvestCustomerMapper.xml +++ b/mallinkService/src/main/resources/mapper/InvestCustomerMapper.xml @@ -38,5 +38,12 @@ + \ No newline at end of file