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/BasWrkStatusController.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/BasWrkStatusController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/BasWrkStatusController.java
index 7c873dc..d43ad00 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/BasWrkStatusController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/BasWrkStatusController.java
@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zy.asrs.common.wms.entity.BasWrkIotype;
import com.zy.asrs.common.wms.entity.BasWrkStatus;
import com.zy.asrs.common.wms.service.BasWrkStatusService;
import com.zy.asrs.framework.annotations.ManagerAuth;
@@ -34,7 +35,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<BasWrkStatus> wrapper = new LambdaQueryWrapper<>();
if (!Cools.isEmpty(condition)) {
wrapper.like(BasWrkStatus::getWrkDesc, condition);
@@ -44,6 +46,9 @@
wrapper.ge(BasWrkStatus::getAppeTime, DateUtils.convert(range[0]));
wrapper.le(BasWrkStatus::getAppeTime, DateUtils.convert(range[1]));
}
+ if (!Cools.isEmpty(param.get("wrk_sts"))) {
+ wrapper.eq(BasWrkStatus::getWrkSts, param.get("wrk_sts"));
+ }
return R.ok(basWrkStatusService.page(new Page<>(curr, limit), wrapper));
}
--
Gitblit v1.9.1