From 901b2ab3e0e7c592602848cfa256f34c5b0c7bb8 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 11 一月 2024 09:57:01 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastLogController.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastLogController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastLogController.java
index 03a5dd9..962d6d6 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastLogController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastLogController.java
@@ -37,7 +37,7 @@
@RequestParam(required = false) String timeRange,
@RequestParam Map<String, Object> param) {
LambdaQueryWrapper<WrkMastLog> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(WrkMastLog::getHostId, getHostId());
+// wrapper.eq(WrkMastLog::getHostId, getHostId());
if (!Cools.isEmpty(condition)) {
wrapper.like(WrkMastLog::getWrkNo, condition);
}
@@ -46,6 +46,19 @@
wrapper.ge(WrkMastLog::getAppeTime, DateUtils.convert(range[0]));
wrapper.le(WrkMastLog::getAppeTime, DateUtils.convert(range[1]));
}
+ if (!Cools.isEmpty(param.get("wrkNo"))) {
+ wrapper.eq(WrkMastLog::getWrkNo, param.get("wrkNo"));
+ }
+ if (!Cools.isEmpty(param.get("wrkSts"))) {
+ wrapper.eq(WrkMastLog::getWrkSts, param.get("wrkSts"));
+ }
+ if (!Cools.isEmpty(param.get("ioType"))) {
+ wrapper.eq(WrkMastLog::getIoType, param.get("ioType"));
+ }
+ if (!Cools.isEmpty(param.get("manuType"))) {
+ wrapper.like(WrkMastLog::getManuType, param.get("manuType"));
+ }
+ wrapper.orderByDesc(WrkMastLog::getId);
return R.ok(wrkMastLogService.page(new Page<>(curr, limit), wrapper));
}
--
Gitblit v1.9.1