From 95059b789744cd84e704f0bffa9ded5bc5f47044 Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期四, 08 七月 2021 12:45:02 +0800
Subject: [PATCH] 1.平仓日入库支持导出(当前页数据)

---
 src/main/java/com/zy/asrs/controller/LocAreaController.java |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/LocAreaController.java b/src/main/java/com/zy/asrs/controller/LocAreaController.java
index e2ee4ef..c039b18 100644
--- a/src/main/java/com/zy/asrs/controller/LocAreaController.java
+++ b/src/main/java/com/zy/asrs/controller/LocAreaController.java
@@ -135,8 +135,14 @@
 
     @RequestMapping(value = "/locArea/queryAll/auth")
     @ManagerAuth
-    public R queryAll() {
-        List<LocArea> result = locAreaService.queryAllLocArea();
+    public R queryAll(String areaType) {
+        List<LocArea> result = locAreaService.queryAllLocArea(areaType);
+        return R.ok(result);
+    }
+
+    @RequestMapping(value = "locArea/query/allArea")
+    public R queryAllArea() {
+        List<LocArea> result = locAreaService.selectList(new EntityWrapper<>());
         return R.ok(result);
     }
 }

--
Gitblit v1.9.1