From d599942e79ea0198898bdfde049b908418debf54 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期五, 13 六月 2025 10:13:14 +0800
Subject: [PATCH] #新增生产日期和到期日期，和超期检索
---
src/main/java/com/zy/asrs/controller/AgvLocDetlController.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvLocDetlController.java b/src/main/java/com/zy/asrs/controller/AgvLocDetlController.java
index f98d3f4..c5d0391 100644
--- a/src/main/java/com/zy/asrs/controller/AgvLocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvLocDetlController.java
@@ -20,6 +20,7 @@
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
+import java.time.LocalDate;
import java.util.List;
import java.util.Map;
@@ -40,14 +41,23 @@
@RequestParam(required = false)String orderByType,
@RequestParam(required = false)String condition,
@RequestParam Map<String, Object> param,
- @RequestParam(required = false)Boolean unreason){
+ @RequestParam(required = false)Boolean unreason,
+ @RequestParam(required = false)Boolean expired){
if (!Cools.isEmpty(unreason) && unreason) {
return R.ok(agvLocDetlService.selectPage(new Page<>(curr, limit), new EntityWrapper<AgvLocDetl>()
.where(" DATALENGTH( batch ) != 11 or\n" +
" batch LIKE '%[a-z]%'")));
}
+ if (!Cools.isEmpty(expired) && expired) {
+ return R.ok(agvLocDetlService.selectPage(
+ new Page<>(curr, limit),
+ new EntityWrapper<AgvLocDetl>()
+ .where("deadline < {0}", LocalDate.now()) // 鏂板鐨勮繃鏈熷垽鏂�
+ ));
+ }
param.remove("unreason");
+ param.remove("expired");
String row = "";
EntityWrapper<AgvLocDetl> wrapper = new EntityWrapper<>();
if (param.get("row") != null) {
--
Gitblit v1.9.1