From 53024ef844835199ab74dbb27bfa10a290c96443 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期一, 30 三月 2026 15:43:13 +0800
Subject: [PATCH] 质押还款提醒，库区错误提醒修复
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SnapRecordService.java | 31 ++++++++++++++++++++-----------
1 files changed, 20 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 0f611fe..d263ace 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,14 @@
}
// 鏀跺偍鍏徃妫�绱�
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())) {
@@ -80,6 +83,10 @@
}
QueryWrapper<SnapRecord> queryWrapper = new QueryWrapper<>();
+ 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());
}
@@ -94,20 +101,22 @@
}
/**
- * 鏂板鏁版嵁
- *
+ * 鎸佷箙鍖栦繚瀛�
* @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