From 2c31f59d84a18e51eb18463ffbe83dd00e9947e4 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Fri, 18 Apr 2025 17:14:51 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=93=81=E6=B7=BB=E5=8A=A0=E5=8F=8A?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=20fix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bonus/canteen/core/menu/domain/MenuDishes.java   | 12 ++++++++++++
 .../bonus/canteen/core/menu/dto/MenuDishesDTO.java   |  5 ++++-
 .../main/resources/mapper/menu/MenuDishesMapper.xml  |  9 ++++++++-
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/domain/MenuDishes.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/domain/MenuDishes.java
index 9f12f33..b04d710 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/domain/MenuDishes.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/domain/MenuDishes.java
@@ -11,6 +11,7 @@ import io.swagger.annotations.ApiModelProperty;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.List;
 
 @TableName("menu_dishes")
 @ApiModel("菜品信息")
@@ -44,6 +45,9 @@ public class MenuDishes extends Model<MenuDishes> {
     @ApiModelProperty("菜品类型ID")
     private Long typeId;
 
+    @ApiModelProperty("菜品类型ID List")
+    private List typeIdList;
+
     @ApiModelProperty("菜品类型名称")
     private String typeName;
 
@@ -258,6 +262,14 @@ public class MenuDishes extends Model<MenuDishes> {
         return this.typeId;
     }
 
+    public List getTypeIdList() {
+        return typeIdList;
+    }
+
+    public void setTypeIdList(List typeIdList) {
+        this.typeIdList = typeIdList;
+    }
+
     public Long getCookId() {
         return this.cookId;
     }
diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/dto/MenuDishesDTO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/dto/MenuDishesDTO.java
index d8ea1eb..fdfb621 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/dto/MenuDishesDTO.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/dto/MenuDishesDTO.java
@@ -104,7 +104,10 @@ public class MenuDishesDTO {
     @ApiModelProperty("灶类")
     private Integer cookId;
 
-    @ApiModelProperty("菜品分类")
+    @ApiModelProperty("菜品类型ID")
+    private Long typeId;
+
+    @ApiModelProperty("菜品分类id(自定义)")
     private Integer classifyId;
 
     @ApiModelProperty("标签id")
diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuDishesMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuDishesMapper.xml
index 1f93c3a..37645aa 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuDishesMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuDishesMapper.xml
@@ -98,6 +98,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="shopstallId != null "> and b.shopstall_id = #{shopstallId}</if>
             <if test="areaId != null "> and b.area_id = #{areaId}</if>
             <if test="typeId != null "> and b.type_id = #{typeId}</if>
+            <if test="typeIdList != null and typeIdList.size() > 0">
+                and b.type_id in
+                <foreach item="id" collection="typeIdList" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
         </where>
     </select>
 
@@ -403,7 +409,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="classifyId != null">classify_id,</if>
             <if test="createBy != null">create_by,</if>
             <if test="customId != null">custom_id,</if>
-
+            <if test="typeId != null">type_id,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="dishesId != null">#{dishesId},</if>
@@ -426,6 +432,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="classifyId != null">#{classifyId},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="customId != null">#{customId},</if>
+            <if test="typeId != null">#{typeId},</if>
         </trim>
     </insert>