From 0dfa182c7043a263ecc5e568f49fe6dcefbcd609 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Tue, 12 Mar 2024 10:49:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=B0=E6=A1=8C=E5=88=97=E8=A1=A8=20?=
 =?UTF-8?q?=E4=B8=8D=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/shop/TbShopTableController.java   |  4 ++--
 .../impl/shopimpl/TbShopTableServiceImpl.java    | 16 ++++++++++++++++
 .../cashier/service/shop/TbShopTableService.java |  2 ++
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopTableController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopTableController.java
index 83d481f6..f43e0b3e 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopTableController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopTableController.java
@@ -54,8 +54,8 @@ public class TbShopTableController {
     @GetMapping
     @Log("查询/shop/table")
     @ApiOperation("查询/shop/table")
-    public ResponseEntity<Object> queryTbShopTable(TbShopTableQueryCriteria criteria, Pageable pageable){
-        return new ResponseEntity<>(tbShopTableService.queryAll(criteria,pageable),HttpStatus.OK);
+    public ResponseEntity<Object> queryTbShopTable(TbShopTableQueryCriteria criteria){
+        return new ResponseEntity<>(tbShopTableService.queryAllNoPage(criteria),HttpStatus.OK);
     }
 
     @PostMapping
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
index 433e1ad0..685d8bff 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
@@ -71,6 +71,22 @@ public class TbShopTableServiceImpl implements TbShopTableService {
         return map;
     }
 
+    @Override
+    public Map<String,Object> queryAllNoPage(TbShopTableQueryCriteria criteria){
+        if (criteria.getAreaId() != null || criteria.getAreaId() == 0) {
+            criteria.setAreaId(null);
+        }
+        List<TbShopTable> tbShopTableList = tbShopTableRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root, criteria, criteriaBuilder));
+        for (TbShopTable date : tbShopTableList) {
+            if (!"".equals(date.getQrcode())){
+                date.setQrcode(QRCODE+date.getQrcode().trim());
+            }
+        }
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("content",tbShopTableList);
+        return map;
+    }
+
     @Override
     public List<TbShopTableDto> queryAll(TbShopTableQueryCriteria criteria){
         return tbShopTableMapper.toDto(tbShopTableRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder)));
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbShopTableService.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbShopTableService.java
index 2af0070f..33f23ecd 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbShopTableService.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/shop/TbShopTableService.java
@@ -40,6 +40,8 @@ public interface TbShopTableService {
     */
     Map<String,Object> queryAll(TbShopTableQueryCriteria criteria, Pageable pageable);
 
+    Map<String,Object> queryAllNoPage(TbShopTableQueryCriteria criteria);
+
     /**
     * 查询所有数据不分页
     * @param criteria 条件参数