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); }