From 1fdfbf546f16ed346ebde4d3a25619f089f217da Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期四, 26 二月 2026 11:07:38 +0800
Subject: [PATCH] 出入库报表，时间检索生效字段调整；AI事件查询条件调整
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutRecordService.java | 7 +++----
fzzy-igdss-web/src/main/resources/templates/security/eventInfo.html | 4 ++--
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/EventInfoService.java | 6 +++++-
3 files changed, 10 insertions(+), 7 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 e0cf3c9..dd96491 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
@@ -63,8 +63,12 @@
queryWrapper.le("time", param.getEnd());
}
//浜嬩欢鍚嶇О
+// if (StringUtils.isNotBlank(param.getName())) {
+// queryWrapper.like("name", param.getName());
+// }
+ //浜嬩欢鏍囩
if (StringUtils.isNotBlank(param.getName())) {
- queryWrapper.like("name", param.getName());
+ queryWrapper.like("tags", param.getName());
}
queryWrapper.orderByDesc("create_time");
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutRecordService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutRecordService.java
index e3ae15f..d52f37d 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutRecordService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutRecordService.java
@@ -24,7 +24,6 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.springframework.beans.BeanUtils;
-import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -137,13 +136,13 @@
queryWrapper.eq("settle_tag", param.getSettleTag());
}
if (null != param.getStart()) {
- queryWrapper.ge("create_time", DateUtil.getCurZero(param.getStart()));
+ queryWrapper.ge("complete_time", DateUtil.getCurZero(param.getStart()));
}
if (null != param.getEnd()) {
- queryWrapper.le("create_time", DateUtil.getNextZero(param.getEnd()));
+ queryWrapper.le("complete_time", DateUtil.getNextZero(param.getEnd()));
}
queryWrapper.ne("record_status", Constant.RECORD_STATUS_DEL); //涓嶆槸鍒犻櫎鐨勫崟瀛愶紝鍗虫甯哥殑鍗曞瓙
- queryWrapper.orderByDesc("create_time");
+ queryWrapper.orderByDesc("complete_time");
return queryWrapper;
}
diff --git a/fzzy-igdss-web/src/main/resources/templates/security/eventInfo.html b/fzzy-igdss-web/src/main/resources/templates/security/eventInfo.html
index 68f7f7e..85ddda1 100644
--- a/fzzy-igdss-web/src/main/resources/templates/security/eventInfo.html
+++ b/fzzy-igdss-web/src/main/resources/templates/security/eventInfo.html
@@ -40,8 +40,8 @@
</select>
</li>
<li th:if="${viewType == '1'}" style="display: flex">
- <label>浜嬩欢鍚嶇О锛�</label>
- <input class="form-control" type="text" name="name" placeholder="璇疯緭鍏ヤ簨浠跺悕绉�">
+ <label>浜嬩欢鏍囩锛�</label>
+ <input class="form-control" type="text" name="name" placeholder="璇疯緭鍏ヤ簨浠舵爣绛�">
</li>
<li class="select-time">
<label style="width: 100px">浜嬩欢鏃堕棿锛� </label>
--
Gitblit v1.9.3