From 3d726738ceeaf670d57f4dbe4439f2f694df1df4 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期一, 25 十二月 2023 14:56:39 +0800
Subject: [PATCH] #
---
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/controller/BasWrkIotypeController.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/controller/BasWrkIotypeController.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/controller/BasWrkIotypeController.java
index deb3919..a147eca 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/controller/BasWrkIotypeController.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/controller/BasWrkIotypeController.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zy.asrs.common.wms.entity.BasLocSts;
import com.zy.asrs.common.wms.entity.BasWrkIotype;
import com.zy.asrs.common.wms.service.BasWrkIotypeService;
import com.zy.asrs.framework.annotations.ManagerAuth;
@@ -32,7 +33,8 @@
public R page(@RequestParam(defaultValue = "1") Integer curr,
@RequestParam(defaultValue = "10") Integer limit,
@RequestParam(required = false) String condition,
- @RequestParam(required = false) String timeRange) {
+ @RequestParam(required = false) String timeRange,
+ @RequestParam Map<String, Object> param) {
LambdaQueryWrapper<BasWrkIotype> wrapper = new LambdaQueryWrapper<>();
if (!Cools.isEmpty(condition)) {
wrapper.like(BasWrkIotype::getIoDesc, condition);
@@ -42,6 +44,9 @@
wrapper.ge(BasWrkIotype::getAppeTime, DateUtils.convert(range[0]));
wrapper.le(BasWrkIotype::getAppeTime, DateUtils.convert(range[1]));
}
+ if (!Cools.isEmpty(param.get("io_type"))) {
+ wrapper.eq(BasWrkIotype::getIoType, param.get("io_type"));
+ }
return R.ok(basWrkIotypeService.page(new Page<>(curr, limit), wrapper));
}
--
Gitblit v1.9.1