From 1eddf64a7104dcd06065e8ac309eebc42c24fb05 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期五, 27 三月 2026 14:29:56 +0800
Subject: [PATCH] 出入库记录导入，判重兜底校验纠正
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SnapRecordService.java | 79 ++++++++++++++++++++++++++++++++++-----
1 files changed, 69 insertions(+), 10 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 86cc26a..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
@@ -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,42 +45,100 @@
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.getKey())) {
+ queryWrapper.likeRight("dept_id", param.getKey());
+ }
+ //鎶撴媿鏃堕棿妫�绱�
+ 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");
return queryWrapper;
}
- public List<SnapRecord> listAll(IgdsBaseParam param) {
-
- if (null == param)
- return snapRecordMapper.selectList(null);
+ /**
+ * 鏌ヨ鎵�鏈夋暟鎹�
+ *
+ * @param param
+ * @author sgj
+ * @date 2025/12/10
+ */
+ 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.isBlank(param.getCompanyId())){
+ param.setCompanyId(ContextUtil.getCompanyId());
}
+ queryWrapper.eq("company_id", param.getCompanyId());
+ 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);
}
- public BaseResp addData(SnapRecord snapRecord) {
- snapRecord.setId(ContextUtil.generateId());
- snapRecord.setCompanyId(ContextUtil.getCompanyId());
+ /**
+ * 鎸佷箙鍖栦繚瀛�
+ * @param snapRecord
+ */
+ 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);
}
+ /**
+ * 鏇存柊鏁版嵁
+ *
+ * @param snapRecord
+ * @author sgj
+ * @date 2025/12/10
+ */
public BaseResp updateData(SnapRecord snapRecord) {
snapRecord.setUpdateBy(ContextUtil.getLoginUserName());
snapRecord.setUpdateTime(new Date());
return snapRecordMapper.updateById(snapRecord) > 0 ? BaseResp.success() : BaseResp.error("鏇存柊澶辫触");
}
+ /**
+ * 鍒犻櫎鏁版嵁
+ *
+ * @param snapRecord
+ * @author sgj
+ * @date 2025/12/10
+ */
public BaseResp deleteData(SnapRecord snapRecord) {
return snapRecordMapper.deleteById(snapRecord) > 0 ? BaseResp.success() : BaseResp.error("鍒犻櫎澶辫触");
}
--
Gitblit v1.9.3