From c2a116119ca4fd2ba2843f2c64cd42df670b7461 Mon Sep 17 00:00:00 2001 From: Burce Date: Wed, 30 Oct 2019 16:57:40 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[=E6=8B=9B=E5=95=86][=E9=A2=84=E7=BA=A6?= =?UTF-8?q?=E6=8F=90=E9=86=92]=E6=8C=89=E7=94=A8=E6=88=B7=E8=BF=87?= =?UTF-8?q?=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/invest/impl/InvestBizServiceImpl.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) 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()))); } From 02c4b115eeef403d58567c7fece0fd67a7597cbb Mon Sep 17 00:00:00 2001 From: Burce Date: Wed, 30 Oct 2019 17:39:34 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[=E6=8B=9B=E5=95=86][=E6=A6=82=E8=A7=88]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/invest/impl/InvestBizServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 976f56390..f5ae81468 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 @@ -1082,7 +1082,7 @@ public class InvestBizServiceImpl implements InvestBizService { .apply("`owner` REGEXP {0}", InvestUserContext.getUserId()))); result.put("customerTotal", demandService.count(new LambdaQueryWrapper() .eq(InvestDemandEntity::getOwner, InvestUserContext.getUserId()) - .eq(InvestDemandEntity::getIntent, InvestUserContext.getUser().getTenantId()))); + .eq(InvestDemandEntity::getTenantId, 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())) From 55c314848b8b80779e4684afadaa51b9ff92c16a Mon Sep 17 00:00:00 2001 From: Burce Date: Wed, 30 Oct 2019 18:35:21 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[=E6=8B=9B=E5=95=86][=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E4=BF=A1=E6=81=AF]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/mapper/InvestCustomerMapper.java | 1 + .../iformall/service/invest/InvestCustomerService.java | 1 + .../service/invest/impl/InvestBizServiceImpl.java | 8 +++----- .../service/invest/impl/InvestCustomerServiceImpl.java | 5 +++++ .../src/main/resources/mapper/InvestCustomerMapper.xml | 7 +++++++ 5 files changed, 17 insertions(+), 5 deletions(-) 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