From 1ca48170fed2b32e2939049e2161118c0c521350 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期四, 29 一月 2026 09:15:44 +0800
Subject: [PATCH] Merge branch 'master' of http://124.71.187.17:8299/r/fzzy-igdss
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/EventInfoService.java | 36 +++++++++++++++++++++++++++++++++---
1 files changed, 33 insertions(+), 3 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 4c122d3..a5f6be8 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
@@ -5,6 +5,7 @@
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;
@@ -55,11 +56,18 @@
}
// 鏀跺偍鍏徃妫�绱�
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("time", param.getStart(), param.getEnd());
+ if (null != param.getStart()) {
+ queryWrapper.ge("time", param.getStart());
+ }
+ if (null != param.getEnd()) {
+ queryWrapper.le("time", param.getEnd());
+ }
+ //浜嬩欢鍚嶇О
+ if (StringUtils.isNotBlank(param.getName())) {
+ queryWrapper.like("name", param.getName());
}
queryWrapper.orderByDesc("create_time");
@@ -78,6 +86,9 @@
}
QueryWrapper<EventInfo> queryWrapper = new QueryWrapper<>();
+ if (StringUtils.isNotBlank(param.getCompanyId())) {
+ queryWrapper.eq("company_id", param.getCompanyId());
+ }
if (StringUtils.isNotBlank(param.getDeptId())) {
queryWrapper.likeRight("dept_id", param.getDeptId());
}
@@ -91,4 +102,23 @@
return eventInfoMapper.selectList(queryWrapper);
}
+ /**
+ * 鎸佷箙鍖栦繚瀛�
+ * @param info
+ */
+ public void addData(EventInfo info) {
+ if(StringUtils.isBlank(info.getId())){
+ info.setId(ContextUtil.generateId());
+ }
+ if(StringUtils.isBlank(info.getCompanyId())){
+ info.setCompanyId(ContextUtil.getCompanyId());
+ }
+
+ info.setUpdateBy(ContextUtil.getLoginUserName());
+ info.setUpdateTime(new Date());
+ info.setCreateBy(ContextUtil.getLoginUserName());
+ info.setCreateTime(new Date());
+ eventInfoMapper.insert(info);
+ }
+
}
--
Gitblit v1.9.3