From 7411561962ca6e45e32844d7a626a6e89b8292e5 Mon Sep 17 00:00:00 2001
From: jiazx0107 <jiazx0107@163.com>
Date: 星期六, 17 一月 2026 16:59:56 +0800
Subject: [PATCH] 调整出入库通知单功能
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/EventInfoService.java | 85 +++++++++++++++++++++++++++++++-----------
1 files changed, 62 insertions(+), 23 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 5c9a3d3..a5f6be8 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
@@ -5,8 +5,11 @@
import com.fzzy.igds.data.BaseResp;
import com.fzzy.igds.data.IgdsBaseParam;
import com.fzzy.igds.domain.EventInfo;
+import com.fzzy.igds.domain.SnapRecord;
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;
@@ -43,43 +46,79 @@
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.likeRight("dept_id", param.getKey());
+ }
+ //鎶撴媿鏃堕棿妫�绱�
+ 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());
+ }
+
queryWrapper.orderByDesc("create_time");
return queryWrapper;
}
- public List<EventInfo> listAll(IgdsBaseParam param) {
- if (null == param)
- return eventInfoMapper.selectList(null);
+ /**
+ *
+ * @param param
+ * @return
+ */
+ public List<EventInfo> getListByParam(IgdsBaseParam param) {
+ if (null == param){
+ param = new IgdsBaseParam();
+ }
QueryWrapper<EventInfo> queryWrapper = new QueryWrapper<>();
- if (StringUtils.isNotEmpty(param.getName())) {
- queryWrapper.like("name", param.getName());
+ if (StringUtils.isNotBlank(param.getCompanyId())) {
+ queryWrapper.eq("company_id", param.getCompanyId());
}
+ if (StringUtils.isNotBlank(param.getDeptId())) {
+ queryWrapper.likeRight("dept_id", param.getDeptId());
+ }
+ if (null != param.getStart()) {
+ queryWrapper.ge("time", DateUtil.getCurZero(param.getStart()));
+ }
+ if (null != param.getEnd()) {
+ queryWrapper.le("time", DateUtil.getNextZero(param.getEnd()));
+ }
+
return eventInfoMapper.selectList(queryWrapper);
}
- public BaseResp addData(EventInfo eventInfo) {
- eventInfo.setId(ContextUtil.generateId());
- eventInfo.setCompanyId(ContextUtil.getCompanyId());
- eventInfo.setUpdateBy(ContextUtil.getLoginUserName());
- eventInfo.setUpdateTime(new Date());
- eventInfo.setCreateBy(ContextUtil.getLoginUserName());
- eventInfo.setCreateTime(new Date());
- return eventInfoMapper.insert(eventInfo) > 0 ? BaseResp.success() : BaseResp.error("娣诲姞澶辫触");
+ /**
+ * 鎸佷箙鍖栦繚瀛�
+ * @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);
}
- public BaseResp updateData(EventInfo eventInfo) {
- eventInfo.setUpdateBy(ContextUtil.getLoginUserName());
- eventInfo.setUpdateTime(new Date());
- return eventInfoMapper.updateById(eventInfo) > 0 ? BaseResp.success() : BaseResp.error("鏇存柊澶辫触");
- }
-
- public BaseResp deleteData(EventInfo eventInfo) {
- return eventInfoMapper.deleteById(eventInfo) > 0 ? BaseResp.success() : BaseResp.error("鍒犻櫎澶辫触");
- }
}
--
Gitblit v1.9.3