From 8bec6dd2d43529e1c065a7bfaf6eaaac38220c7f Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 02 一月 2024 10:21:55 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/StaDescController.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/StaDescController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/StaDescController.java
index 80076b9..c014b42 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/StaDescController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/StaDescController.java
@@ -1,11 +1,9 @@
package com.zy.asrs.wms.controller;
-import com.alibaba.fastjson.JSONArray;
-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.StaDesc;
-import com.zy.asrs.common.wms.service.StaDescService;
+import com.zy.asrs.common.domain.entity.StaDesc;
+import com.zy.asrs.common.sys.service.StaDescService;
import com.zy.asrs.framework.annotations.ManagerAuth;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
@@ -37,6 +35,7 @@
@RequestParam(required = false) String timeRange,
@RequestParam Map<String, Object> param) {
LambdaQueryWrapper<StaDesc> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(StaDesc::getHostId, getHostId());
if (!Cools.isEmpty(condition)) {
wrapper.like(StaDesc::getTypeId, condition);
}
@@ -45,6 +44,12 @@
wrapper.ge(StaDesc::getAppeTime, DateUtils.convert(range[0]));
wrapper.le(StaDesc::getAppeTime, DateUtils.convert(range[1]));
}
+ if (!Cools.isEmpty(param.get("device_no"))) {
+ wrapper.eq(StaDesc::getDeviceNo, param.get("device_no"));
+ }
+ if (!Cools.isEmpty(param.get("device_stn"))) {
+ wrapper.eq(StaDesc::getDeviceStn, param.get("device_stn"));
+ }
return R.ok(staDescService.page(new Page<>(curr, limit), wrapper));
}
@@ -52,6 +57,7 @@
@RequestMapping(value = "/staDesc/add/auth")
@ManagerAuth
public R add(StaDesc staDesc) {
+ staDesc.setHostId(getHostId());
staDescService.save(staDesc);
return R.ok();
}
@@ -79,6 +85,7 @@
@ManagerAuth
public R query(String condition) {
LambdaQueryWrapper<StaDesc> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(StaDesc::getHostId, getHostId());
wrapper.like(StaDesc::getTypeId, condition);
Page<StaDesc> page = staDescService.page(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
@@ -96,6 +103,7 @@
public R getDataKV(@RequestParam(required = false) String condition) {
List<KeyValueVo> vos = new ArrayList<>();
LambdaQueryWrapper<StaDesc> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(StaDesc::getHostId, getHostId());
if (!Cools.isEmpty(condition)) {
wrapper.like(StaDesc::getTypeId, condition);
}
--
Gitblit v1.9.1