From 1ce4ac075a1c2b6ab9c313e5d46a97a9f3ec4ca3 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 22 十月 2025 10:09:33 +0800
Subject: [PATCH] 修改bug
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java
index 817978b..7608496 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java
@@ -905,7 +905,7 @@
Integer roleType = user.getRoleType();
if (roleType == 1) {
- List<TCrmClinic> list = crmClinicService.list();
+ List<TCrmClinic> list = crmClinicService.list(new LambdaQueryWrapper<TCrmClinic>().in(TCrmClinic::getStatus,Arrays.asList(3,4,5)));
if (!list.isEmpty()) {
long branchCount = crmBranchService.count();
@@ -976,8 +976,11 @@
break;
}
- branchAdminStatisticsOneVo.setBranchMoney(collect3.stream().filter(e -> e.getCommissionType() == 1).map(TErpProcurementCommission::getMoney).reduce(BigDecimal::add).get());
- branchAdminStatisticsOneVo.setStaffMoney(collect3.stream().filter(e -> e.getCommissionType() == 2).map(TErpProcurementCommission::getMoney).reduce(BigDecimal::add).get());
+ if(!collect3.isEmpty()){
+
+ branchAdminStatisticsOneVo.setBranchMoney(collect3.stream().filter(e -> e.getCommissionType() == 1).map(TErpProcurementCommission::getMoney).reduce(BigDecimal::add).get());
+ branchAdminStatisticsOneVo.setStaffMoney(collect3.stream().filter(e -> e.getCommissionType() == 2).map(TErpProcurementCommission::getMoney).reduce(BigDecimal::add).get());
+ }
}
@@ -1005,6 +1008,7 @@
if (query.getSalespersonId() != null && !query.getSalespersonId().isEmpty()) {
w.eq(TCrmClinic::getSalespersonId, query.getSalespersonId());
}
+ w.in(TCrmClinic::getStatus,Arrays.asList(3,4,5));
List<TCrmClinic> list = crmClinicService.list(w);
branchAdminStatisticsOneVo.setClinicNum(list.size());
--
Gitblit v1.7.1