From 0329de5a2343a179be54a9c70844515db202a998 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期一, 19 一月 2026 09:42:52 +0800
Subject: [PATCH] 细节调整1
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SnapRecordService.java | 32 +++++++++++++++++++++-----------
1 files changed, 21 insertions(+), 11 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 a99d031..507d246 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,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("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())) {
+ queryWrapper.like("tags", param.getName());
}
queryWrapper.orderByDesc("create_time");
@@ -85,24 +92,27 @@
if (null != param.getEnd()) {
queryWrapper.le("snap_time", DateUtil.getNextZero(param.getEnd()));
}
+ queryWrapper.orderByDesc("snap_time");
return snapRecordMapper.selectList(queryWrapper);
}
/**
- * 鏂板鏁版嵁
- *
+ * 鎸佷箙鍖栦繚瀛�
* @param snapRecord
- * @author sgj
- * @date 2025/12/10
*/
- public BaseResp addData(SnapRecord snapRecord) {
- snapRecord.setId(ContextUtil.generateId());
- snapRecord.setCompanyId(ContextUtil.getCompanyId());
+ public void addData(SnapRecord snapRecord) {
+ if(StringUtils.isBlank(snapRecord.getId())){
+ snapRecord.setId(ContextUtil.generateId());
+ }
+ if(StringUtils.isBlank(snapRecord.getCompanyId())){
+ snapRecord.setCompanyId(ContextUtil.getCompanyId());
+ }
+
snapRecord.setUpdateBy(ContextUtil.getLoginUserName());
snapRecord.setUpdateTime(new Date());
snapRecord.setCreateBy(ContextUtil.getLoginUserName());
snapRecord.setCreateTime(new Date());
- return snapRecordMapper.insert(snapRecord) > 0 ? BaseResp.success() : BaseResp.error("娣诲姞澶辫触");
+ snapRecordMapper.insert(snapRecord);
}
/**
--
Gitblit v1.9.3