From b688c3fe1ecdf645cbc8658139d29f1340acbf4e Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期二, 09 十二月 2025 15:24:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/GrainService.java | 31 +++++++++++++++++++++++++++++++
1 files changed, 31 insertions(+), 0 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/GrainService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/GrainService.java
index 24520e5..a1a2d4c 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/GrainService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/GrainService.java
@@ -1,8 +1,11 @@
package com.fzzy.igds.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fzzy.igds.data.GrainParam;
+import com.fzzy.igds.data.InoutParam;
import com.fzzy.igds.domain.Grain;
+import com.fzzy.igds.domain.InoutRecord;
import com.fzzy.igds.mapper.GrainMapper;
import com.fzzy.igds.utils.ContextUtil;
import com.fzzy.igds.utils.DateUtil;
@@ -10,7 +13,10 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.util.Date;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
* @Description
@@ -59,7 +65,32 @@
return grainMapper.selectList(queryWrapper);
}
+ /**
+ * 鍒嗛〉鏌ヨ鏁版嵁
+ * @param page
+ * @param param
+ */
+ public void pageData(Page<Grain> page, Map<String, Object> param) {
+ QueryWrapper<Grain> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("company_id", ContextUtil.getCompanyId());
+ queryWrapper.eq("dept_id", ContextUtil.subDeptId(null));
+
+ String ids = (String) param.get("ids");
+ if (StringUtils.isNotBlank(ids)) {
+ queryWrapper.in("depot_id", ids);
+ }
+ Date date = (Date) param.get(("start"));
+ if (null != date) {
+ queryWrapper.ge("receive_date", DateUtil.getCurZero(date));
+ }
+ date = (Date) param.get(("end"));
+ if (null != date) {
+ queryWrapper.le("receive_date", DateUtil.getNextZero(date));
+ }
+ queryWrapper.orderByDesc("batch_id");
+ grainMapper.selectPage(page, queryWrapper);
+ }
}
--
Gitblit v1.9.3