zt/canteen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/test'

Browse Source
This commit is contained in:
zengtao01
2024-07-19 10:23:40 +08:00
parent 5c6ee56792 e91a1c95d5
commit a5bed8bac7
3 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/diningplates/vo/DiningPlatesPageReqVO.java
View File

@ -1,10 +1,12 @@
package cn.iocoder.yudao.module.member.controller.admin.diningplates.vo; 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 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 org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; 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) @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime; private LocalDateTime[] createTime;
private Long storeId;
} }

12
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/diningplates/vo/DiningPlatesRespVO.java
View File

@ -36,4 +36,16 @@ public class DiningPlatesRespVO {
@ExcelProperty("创建时间") @ExcelProperty("创建时间")
private LocalDateTime createTime; private LocalDateTime createTime;
/**
* 所属门店
*/
private Long storeId;
/**
* 所属门店
*/
@ExcelProperty("所属门店")
private String storeName;
} }

1
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/diningplates/DiningPlatesMapper.java
View File

@ -20,6 +20,7 @@ public interface DiningPlatesMapper extends BaseMapperX<DiningPlatesDO> {
.eqIfPresent(DiningPlatesDO::getDiningPlatesNum, reqVO.getDiningPlatesNum()) .eqIfPresent(DiningPlatesDO::getDiningPlatesNum, reqVO.getDiningPlatesNum())
.eqIfPresent(DiningPlatesDO::getUserId, reqVO.getUserId()) .eqIfPresent(DiningPlatesDO::getUserId, reqVO.getUserId())
.eqIfPresent(DiningPlatesDO::getStatus, reqVO.getStatus()) .eqIfPresent(DiningPlatesDO::getStatus, reqVO.getStatus())
.eqIfPresent(DiningPlatesDO::getStoreId,reqVO.getStoreId())
.betweenIfPresent(DiningPlatesDO::getBindingTime, reqVO.getBindingTime()) .betweenIfPresent(DiningPlatesDO::getBindingTime, reqVO.getBindingTime())
.betweenIfPresent(DiningPlatesDO::getCreateTime, reqVO.getCreateTime()) .betweenIfPresent(DiningPlatesDO::getCreateTime, reqVO.getCreateTime())
.orderByDesc(DiningPlatesDO::getId)); .orderByDesc(DiningPlatesDO::getId));