From f4c97c567255689ea0f720ad6778461b289d8c50 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Tue, 25 Mar 2025 19:19:50 +0800
Subject: [PATCH] bug 5409
---
.../canteen/core/menu/dto/MenuMaterialPageDTO.java | 10 ++++++++++
.../main/resources/mapper/menu/MenuMaterialMapper.xml | 3 +++
2 files changed, 13 insertions(+)
diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/dto/MenuMaterialPageDTO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/dto/MenuMaterialPageDTO.java
index 8faec339..3c4d3249 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/dto/MenuMaterialPageDTO.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/dto/MenuMaterialPageDTO.java
@@ -24,6 +24,8 @@ public class MenuMaterialPageDTO extends PageDTO {
@ApiModelProperty("禁用状态 1启用 2禁用")
private Integer disableStatus;
+ private String materialCode;
+
public String getMaterialName() {
return this.materialName;
@@ -61,6 +63,14 @@ public class MenuMaterialPageDTO extends PageDTO {
return this.disableStatus;
}
+ public String getMaterialCode() {
+ return materialCode;
+ }
+
+ public void setMaterialCode(String materialCode) {
+ this.materialCode = materialCode;
+ }
+
public void setMaterialName(final String materialName) {
this.materialName = materialName;
}
diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuMaterialMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuMaterialMapper.xml
index 2902c4fc..ee9bbbde 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuMaterialMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuMaterialMapper.xml
@@ -111,6 +111,9 @@
and mm.disable_status = #{content.disableStatus}
+
+ and mm.material_code = #{content.materialCode}
+
order by
mm.crtime desc, mm.material_code desc