From 2eb5830142d0873626ee3f6f07a334fb6b10cc0c Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 03 十二月 2025 17:08:47 +0800
Subject: [PATCH] 文档新增
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 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 e024759..db32af6 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
@@ -623,8 +623,16 @@
.eq(TCrmBranch::getUserId, user.getUserId())
.last("LIMIT 1"));
if (branch != null) {
- List<TCrmClinic> list = crmClinicService.list(Wrappers.lambdaQuery(TCrmClinic.class).eq(TCrmClinic::getBranchId, branch.getId()).in(TCrmClinic::getStatus, Arrays.asList(3, 4, 5)));
- if (!list.isEmpty()) {
+ List<TCrmClinic> list = new ArrayList<>();
+ if(query.getBranchId()!=null && !"".equals(query.getBranchId())){
+ list = crmClinicService.list(Wrappers.lambdaQuery(TCrmClinic.class).eq(TCrmClinic::getBranchId, branch.getId()).in(TCrmClinic::getStatus, Arrays.asList(3, 4, 5)));
+ }else {
+
+ // 省查下面所有的区 和 城市公司
+ // 区查下面所有城市公司
+ // 城市查当前 原来逻辑
+ }
+ if (!list.isEmpty()) {
List<String> crmClinicIds = list.stream().map(TCrmClinic::getId).collect(Collectors.toList());
// 获取最近一年的时间
--
Gitblit v1.7.1