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/WrkLastnoController.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkLastnoController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkLastnoController.java
index a8a554b..0cd4fdd 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkLastnoController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkLastnoController.java
@@ -1,7 +1,5 @@
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.WrkLastno;
@@ -25,8 +23,8 @@
@RequestMapping(value = "/wrkLastno/{id}/auth")
@ManagerAuth
- public R get(@PathVariable("id") String id) {
- return R.ok(wrkLastnoService.getById(String.valueOf(id)));
+ public R get(@PathVariable("id") Long id) {
+ return R.ok(wrkLastnoService.getById(id));
}
@RequestMapping(value = "/wrkLastno/page/auth")
@@ -37,6 +35,7 @@
@RequestParam(required = false) String timeRange,
@RequestParam Map<String, Object> param) {
LambdaQueryWrapper<WrkLastno> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(WrkLastno::getHostId, getHostId());
if (!Cools.isEmpty(condition)) {
wrapper.like(WrkLastno::getWrkMk, condition);
}
@@ -45,13 +44,15 @@
wrapper.ge(WrkLastno::getAppeTime, DateUtils.convert(range[0]));
wrapper.le(WrkLastno::getAppeTime, DateUtils.convert(range[1]));
}
- return R.ok(wrkLastnoService.page(new Page<>(curr, limit), wrapper));
+ Page<WrkLastno> page = wrkLastnoService.page(new Page<>(curr, limit), wrapper);
+ return R.ok(page);
}
@RequestMapping(value = "/wrkLastno/add/auth")
@ManagerAuth
public R add(WrkLastno wrkLastno) {
+ wrkLastno.setHostId(getHostId());
wrkLastnoService.save(wrkLastno);
return R.ok();
}
@@ -79,6 +80,7 @@
@ManagerAuth
public R query(String condition) {
LambdaQueryWrapper<WrkLastno> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(WrkLastno::getHostId, getHostId());
wrapper.like(WrkLastno::getWrkMk, condition);
Page<WrkLastno> page = wrkLastnoService.page(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
@@ -96,6 +98,7 @@
public R getDataKV(@RequestParam(required = false) String condition) {
List<KeyValueVo> vos = new ArrayList<>();
LambdaQueryWrapper<WrkLastno> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(WrkLastno::getHostId, getHostId());
if (!Cools.isEmpty(condition)) {
wrapper.like(WrkLastno::getWrkMk, condition);
}
--
Gitblit v1.9.1