From 0d59d664b3b81e9264df6ad513d06b1b2c84c931 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期五, 27 三月 2026 11:43:34 +0800
Subject: [PATCH] 大屏首页储量数量展示，仅展示散粮；抓拍跟踪图片展示业务逻辑调整
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/EventInfoService.java | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 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 a5f6be8..f1d15b6 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
@@ -2,14 +2,11 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fzzy.igds.data.BaseResp;
import com.fzzy.igds.data.IgdsBaseParam;
import com.fzzy.igds.domain.EventInfo;
-import com.fzzy.igds.domain.SnapRecord;
import com.fzzy.igds.mapper.EventInfoMapper;
import com.fzzy.igds.utils.ContextUtil;
import com.fzzy.igds.utils.DateUtil;
-import com.fzzy.work.domain.WorkOrder;
import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -66,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");
@@ -81,14 +82,18 @@
* @return
*/
public List<EventInfo> getListByParam(IgdsBaseParam param) {
- if (null == param){
+ if (null == param) {
param = new IgdsBaseParam();
}
QueryWrapper<EventInfo> queryWrapper = new QueryWrapper<>();
- if (StringUtils.isNotBlank(param.getCompanyId())) {
- queryWrapper.eq("company_id", param.getCompanyId());
+
+
+ if (StringUtils.isBlank(param.getCompanyId())) {
+ param.setCompanyId(ContextUtil.getCompanyId());
}
+ queryWrapper.eq("company_id", param.getCompanyId());
+
if (StringUtils.isNotBlank(param.getDeptId())) {
queryWrapper.likeRight("dept_id", param.getDeptId());
}
@@ -104,13 +109,14 @@
/**
* 鎸佷箙鍖栦繚瀛�
+ *
* @param info
*/
public void addData(EventInfo info) {
- if(StringUtils.isBlank(info.getId())){
+ if (StringUtils.isBlank(info.getId())) {
info.setId(ContextUtil.generateId());
}
- if(StringUtils.isBlank(info.getCompanyId())){
+ if (StringUtils.isBlank(info.getCompanyId())) {
info.setCompanyId(ContextUtil.getCompanyId());
}
--
Gitblit v1.9.3