From f84448a10d99a0fa82e71088051e3517637edaa7 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 09 四月 2024 15:11:52 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastController.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastController.java
index dfc2f9d..04283ca 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastController.java
@@ -37,13 +37,20 @@
@RequestParam(required = false) String timeRange,
@RequestParam Map<String, Object> param) {
LambdaQueryWrapper<WrkMast> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(WrkMast::getHostId, getHostId());
if (!Cools.isEmpty(condition)) {
wrapper.like(WrkMast::getWrkNo, condition);
}
if (!Cools.isEmpty(timeRange)) {
String[] range = timeRange.split(RANGE_TIME_LINK);
- wrapper.ge(WrkMast::getAppeTime, DateUtils.convert(range[0]));
- wrapper.le(WrkMast::getAppeTime, DateUtils.convert(range[1]));
+ wrapper.ge(WrkMast::getIoTime, DateUtils.convert(range[0]));
+ wrapper.le(WrkMast::getIoTime, DateUtils.convert(range[1]));
+ }
+ if (!Cools.isEmpty(param.get("wrk_no"))) {
+ wrapper.eq(WrkMast::getWrkNo, param.get("wrk_no"));
+ }
+ if (!Cools.isEmpty(param.get("wrk_sts"))) {
+ wrapper.eq(WrkMast::getWrkSts, param.get("wrk_sts"));
}
return R.ok(wrkMastService.page(new Page<>(curr, limit), wrapper));
}
@@ -52,6 +59,7 @@
@RequestMapping(value = "/wrkMast/add/auth")
@ManagerAuth
public R add(WrkMast wrkMast) {
+ wrkMast.setHostId(getHostId());
wrkMastService.save(wrkMast);
return R.ok();
}
@@ -79,6 +87,7 @@
@ManagerAuth
public R query(String condition) {
LambdaQueryWrapper<WrkMast> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(WrkMast::getHostId, getHostId());
wrapper.like(WrkMast::getWrkNo, condition);
Page<WrkMast> page = wrkMastService.page(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
@@ -96,6 +105,7 @@
public R getDataKV(@RequestParam(required = false) String condition) {
List<KeyValueVo> vos = new ArrayList<>();
LambdaQueryWrapper<WrkMast> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(WrkMast::getHostId, getHostId());
if (!Cools.isEmpty(condition)) {
wrapper.like(WrkMast::getWrkNo, condition);
}
--
Gitblit v1.9.1