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/EventInfoService.java | 48 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 42 insertions(+), 6 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..f1d15b6 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
@@ -2,13 +2,11 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fzzy.igds.data.BaseResp;
import com.fzzy.igds.data.IgdsBaseParam;
import com.fzzy.igds.domain.EventInfo;
import com.fzzy.igds.mapper.EventInfoMapper;
import com.fzzy.igds.utils.ContextUtil;
import com.fzzy.igds.utils.DateUtil;
-import com.fzzy.work.domain.WorkOrder;
import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -55,11 +53,22 @@
}
// 鏀跺偍鍏徃妫�绱�
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());
+// }
+ //浜嬩欢鏍囩
+ if (StringUtils.isNotBlank(param.getName())) {
+ queryWrapper.like("tags", param.getName());
}
queryWrapper.orderByDesc("create_time");
@@ -73,11 +82,18 @@
* @return
*/
public List<EventInfo> getListByParam(IgdsBaseParam param) {
- if (null == param){
+ if (null == param) {
param = new IgdsBaseParam();
}
QueryWrapper<EventInfo> 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());
}
@@ -91,4 +107,24 @@
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