From e356555905a02466a25206bae8f9bc66f3432d4f Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期三, 07 一月 2026 14:20:09 +0800
Subject: [PATCH] 报表优化修改

---
 fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SnapRecordService.java |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SnapRecordService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SnapRecordService.java
index 0f611fe..73b5df0 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SnapRecordService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SnapRecordService.java
@@ -51,11 +51,14 @@
         }
         // 鏀跺偍鍏徃妫�绱�
         if (StringUtils.isNotBlank(param.getKey())) {
-            queryWrapper.apply("dept_id IN (SELECT dept_id FROM sys_dept WHERE parent_id = {0})", param.getKey());
+            queryWrapper.likeRight("dept_id", param.getKey());
         }
         //鎶撴媿鏃堕棿妫�绱�
-        if (param.getStart() != null && param.getEnd() != null) {
-            queryWrapper.between("snap_time", param.getStart(), param.getEnd());
+        if (null != param.getStart()) {
+            queryWrapper.ge("snap_time",param.getStart());
+        }
+        if (null != param.getEnd()) {
+            queryWrapper.le("snap_time", param.getEnd());
         }
         //鏍囩妫�绱�
         if (StringUtils.isNotBlank(param.getName())) {

--
Gitblit v1.9.3