From 130089bf61604d63af0cd96e808bf786477dd2a0 Mon Sep 17 00:00:00 2001 From: MerCry Date: Fri, 13 Mar 2026 00:31:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=90=E5=8D=95=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E4=B8=8D=E6=AD=A3=E7=A1=AE=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/excel/wecom/helper/HandleAllData.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/excel-handle/src/main/java/com/ruoyi/excel/wecom/helper/HandleAllData.java b/excel-handle/src/main/java/com/ruoyi/excel/wecom/helper/HandleAllData.java index b2e7390..ab07f42 100644 --- a/excel-handle/src/main/java/com/ruoyi/excel/wecom/helper/HandleAllData.java +++ b/excel-handle/src/main/java/com/ruoyi/excel/wecom/helper/HandleAllData.java @@ -430,7 +430,11 @@ import java.util.concurrent.atomic.AtomicInteger; int pageNum = 1; LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(CustomerExportData::getCorpId, corpId) - .eq(CustomerExportData::getAddDate, targetDate); + .and(w -> w.eq(CustomerExportData::getAddDate, targetDate) + .or() + .eq(CustomerExportData::getFinishDate, targetDate)); + + ; while (true) { Page page = new Page<>(pageNum, pageSize); @@ -500,6 +504,7 @@ import java.util.concurrent.atomic.AtomicInteger; pageNum++; } + // // 3. 从累加器生成最终结果 return generateDepartmentStatisticsResults(corpId,accumulator, targetDate); }