From 58067aa57fe5583fde99a61a8d79e3f355727329 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期三, 17 十二月 2025 16:30:41 +0800
Subject: [PATCH] 巡检监管页面、及巡检记录页面
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/EventInfoService.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/EventInfoService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/EventInfoService.java
index a4980e9..c4c092e 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/EventInfoService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/EventInfoService.java
@@ -43,14 +43,23 @@
param.setCompanyId(ContextUtil.getCompanyId());
queryWrapper.eq("company_id", param.getCompanyId());
- //搴撳尯
+ //搴撳尯妫�绱�
if (StringUtils.isNotBlank(param.getDeptId())) {
queryWrapper.eq("dept_id", param.getDeptId());
}
- //浠撳簱
+ //浠撳簱妫�绱�
if (StringUtils.isNotBlank(param.getDepotId())) {
queryWrapper.eq("depot_id", param.getDepotId());
}
+ // 鏀跺偍鍏徃妫�绱�
+ if (StringUtils.isNotBlank(param.getKey())) {
+ queryWrapper.apply("dept_id IN (SELECT dept_id FROM sys_dept WHERE parent_id = {0})", param.getKey());
+ }
+ //鎶撴媿鏃堕棿妫�绱�
+ if (param.getStart() != null && param.getEnd() != null) {
+ queryWrapper.between("time", param.getStart(), param.getEnd());
+ }
+
queryWrapper.orderByDesc("create_time");
return queryWrapper;
--
Gitblit v1.9.3