From 4aff6ce5a44047245f86e776d3b6b67314aed70e Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期五, 26 十二月 2025 14:55:17 +0800
Subject: [PATCH] 增加库区配置，合并通知单、及流程和设备配置
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SnapRecordService.java | 33 +++++++++++++++++++++------------
1 files changed, 21 insertions(+), 12 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 2a4acd5..0f611fe 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
@@ -7,6 +7,7 @@
import com.fzzy.igds.domain.SnapRecord;
import com.fzzy.igds.mapper.SnapRecordMapper;
import com.fzzy.igds.utils.ContextUtil;
+import com.fzzy.igds.utils.DateUtil;
import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -44,20 +45,21 @@
param.setCompanyId(ContextUtil.getCompanyId());
queryWrapper.eq("company_id", param.getCompanyId());
+ //搴撳尯妫�绱�
if (StringUtils.isNotBlank(param.getDeptId())) {
queryWrapper.eq("dept_id", param.getDeptId());
}
-
- if (StringUtils.isNotBlank(param.getDepotId())) {
- queryWrapper.eq("depot_id", param.getDepotId());
- }
- //鏍囩妫�绱�
+ // 鏀跺偍鍏徃妫�绱�
if (StringUtils.isNotBlank(param.getKey())) {
- queryWrapper.like("tags", param.getKey());
+ queryWrapper.apply("dept_id IN (SELECT dept_id FROM sys_dept WHERE parent_id = {0})", param.getKey());
}
//鎶撴媿鏃堕棿妫�绱�
if (param.getStart() != null && param.getEnd() != null) {
queryWrapper.between("snap_time", param.getStart(), param.getEnd());
+ }
+ //鏍囩妫�绱�
+ if (StringUtils.isNotBlank(param.getName())) {
+ queryWrapper.like("tags", param.getName());
}
queryWrapper.orderByDesc("create_time");
@@ -72,15 +74,22 @@
* @author sgj
* @date 2025/12/10
*/
- public List<SnapRecord> listAll(IgdsBaseParam param) {
-
- if (null == param)
- return snapRecordMapper.selectList(null);
+ public List<SnapRecord> getListByParam(IgdsBaseParam param) {
+ if (null == param){
+ param = new IgdsBaseParam();
+ }
QueryWrapper<SnapRecord> queryWrapper = new QueryWrapper<>();
- if (StringUtils.isNotEmpty(param.getName())) {
- queryWrapper.like("name", param.getName());
+ if (StringUtils.isNotBlank(param.getDeptId())) {
+ queryWrapper.likeRight("dept_id", param.getDeptId());
}
+ if (null != param.getStart()) {
+ queryWrapper.ge("snap_time", DateUtil.getCurZero(param.getStart()));
+ }
+ if (null != param.getEnd()) {
+ queryWrapper.le("snap_time", DateUtil.getNextZero(param.getEnd()));
+ }
+ queryWrapper.orderByDesc("snap_time");
return snapRecordMapper.selectList(queryWrapper);
}
--
Gitblit v1.9.3