From 9f879eca290b9c2ad2f793ba185a6e73b6fc90ba Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期一, 16 十二月 2024 10:26:38 +0800
Subject: [PATCH] 1
---
ruoyi-service/ruoyi-other/src/main/resources/mapper/other/ShopMapper.xml | 13 +++++++------
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Shop.java | 3 ---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopServiceImpl.java | 3 +--
3 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Shop.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Shop.java
index 365ee43..37a518d 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Shop.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Shop.java
@@ -163,9 +163,6 @@
@TableField("create_time")
private LocalDateTime createTime;
- @ApiModelProperty(value = "店长姓名")
- @TableField(exist = false)
- private String managerName;
}
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopServiceImpl.java
index 79ad2ef..e7f1abd 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopServiceImpl.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopServiceImpl.java
@@ -49,8 +49,7 @@
Page<Shop> page = new Page<>();
page.setCurrent(PageNum);
page.setSize(pageSize);
- IPage<Shop> shopIPage = shopMapper.selectShopList(page, shop);
- return shopIPage;
+ return shopMapper.selectShopList(page, shop);
}
@Override
diff --git a/ruoyi-service/ruoyi-other/src/main/resources/mapper/other/ShopMapper.xml b/ruoyi-service/ruoyi-other/src/main/resources/mapper/other/ShopMapper.xml
index 3b93eeb..488c812 100644
--- a/ruoyi-service/ruoyi-other/src/main/resources/mapper/other/ShopMapper.xml
+++ b/ruoyi-service/ruoyi-other/src/main/resources/mapper/other/ShopMapper.xml
@@ -58,20 +58,21 @@
ts.id,
ts.`name`,
ts.business_date,
- tau.`name` managerName,
+ ts.start_time,
+ ts.end_time,
ts.phone,
ts.address,
- ts.`status`
+ ts.`status`,
+ ts.shop_manager
FROM
- `qijisheng_other`.t_shop ts
- LEFT JOIN `qijisheng_account`.t_app_user tau ON ts.app_user_id = tau.id
+ t_shop ts
<where>
ts.del_flag = 0
<if test="shop.name != null and shop.name != ''">
and ts.name like concat('%',#{shop.name},'%')
</if>
- <if test="shop.managerName != null and shop.managerName != ''">
- and tau.name like concat('%',#{shop.managerName},'%')
+ <if test="shop.shopManager != null and shop.shopManager != ''">
+ and ts.shop_manager like concat('%',#{shop.shopManager},'%')
</if>
<if test="shop.phone != null and shop.phone != ''">
and ts.phone like concat('%',#{shop.phone},'%')
--
Gitblit v1.7.1