From e91a1c95d5b958d21c044120cb20d62296c55320 Mon Sep 17 00:00:00 2001 From: zengtao01 Date: Fri, 19 Jul 2024 10:23:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/diningplates/vo/DiningPlatesPageReqVO.java | 10 +++++++--- .../admin/diningplates/vo/DiningPlatesRespVO.java | 12 ++++++++++++ .../dal/mysql/diningplates/DiningPlatesMapper.java | 1 + 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/diningplates/vo/DiningPlatesPageReqVO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/diningplates/vo/DiningPlatesPageReqVO.java index 857adeee..0614ec79 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/diningplates/vo/DiningPlatesPageReqVO.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/diningplates/vo/DiningPlatesPageReqVO.java @@ -1,10 +1,12 @@ package cn.iocoder.yudao.module.member.controller.admin.diningplates.vo; -import lombok.*; -import java.util.*; -import io.swagger.v3.oas.annotations.media.Schema; import cn.iocoder.yudao.framework.common.pojo.PageParam; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; import org.springframework.format.annotation.DateTimeFormat; + import java.time.LocalDateTime; import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @@ -32,4 +34,6 @@ public class DiningPlatesPageReqVO extends PageParam { @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] createTime; + private Long storeId; + } \ No newline at end of file diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/diningplates/vo/DiningPlatesRespVO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/diningplates/vo/DiningPlatesRespVO.java index 7127bfbb..9972576b 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/diningplates/vo/DiningPlatesRespVO.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/diningplates/vo/DiningPlatesRespVO.java @@ -36,4 +36,16 @@ public class DiningPlatesRespVO { @ExcelProperty("创建时间") private LocalDateTime createTime; + /** + * 所属门店 + */ + + private Long storeId; + + /** + * 所属门店 + */ + @ExcelProperty("所属门店") + private String storeName; + } \ No newline at end of file diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/diningplates/DiningPlatesMapper.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/diningplates/DiningPlatesMapper.java index 0c565edd..5fda824e 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/diningplates/DiningPlatesMapper.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/diningplates/DiningPlatesMapper.java @@ -20,6 +20,7 @@ public interface DiningPlatesMapper extends BaseMapperX { .eqIfPresent(DiningPlatesDO::getDiningPlatesNum, reqVO.getDiningPlatesNum()) .eqIfPresent(DiningPlatesDO::getUserId, reqVO.getUserId()) .eqIfPresent(DiningPlatesDO::getStatus, reqVO.getStatus()) + .eqIfPresent(DiningPlatesDO::getStoreId,reqVO.getStoreId()) .betweenIfPresent(DiningPlatesDO::getBindingTime, reqVO.getBindingTime()) .betweenIfPresent(DiningPlatesDO::getCreateTime, reqVO.getCreateTime()) .orderByDesc(DiningPlatesDO::getId));