From e2c35c50925cf18da69f947d43cba4004384dd3c Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Mon, 30 Jun 2025 16:45:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89supermarket=5Fmaterial?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/cook/CookMaterialMapper.xml        | 34 +++++++++++++------
 .../mapper/cook/CookMaterialTypeMapper.xml    | 32 ++++++++++++-----
 2 files changed, 47 insertions(+), 19 deletions(-)

diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookMaterialMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookMaterialMapper.xml
index 7d29d37..5ef5caa 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookMaterialMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookMaterialMapper.xml
@@ -92,25 +92,39 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <select id="selectCookMaterialByMaterialId" parameterType="Long" resultMap="CookMaterialResult">
         <include refid="selectCookMaterialVo"/>
-        where cm.goods_type = 1 and cm.material_id = #{materialId}
+        <where>
+            cm.material_id = #{materialId}
+            <if test="goodsType != null "> and cm.goods_type = #{goodsType}</if>
+        </where>
     </select>
 
     <select id="checkIsExistByCode" resultType="java.lang.Integer">
-        select count(1) from cook_material where cm.goods_type = 1 and material_code = #{materialCode}
-        <if test="materialId != null and materialId != ''"> and material_id != #{materialId}</if>
+        select count(1) from cook_material
+        <where>
+            material_code = #{materialCode}
+            <if test="materialId != null and materialId != ''"> and material_id != #{materialId}</if>
+            <if test="goodsType != null "> and cm.goods_type = #{goodsType}</if>
+        </where>
     </select>
 
     <select id="checkIsExistByName" resultType="java.lang.Integer">
-        select count(1) from cook_material where cm.goods_type = 1 and material_name = #{materialName}
-        <if test="materialId != null and materialId != ''"> and material_id != #{materialId}</if>
+        select count(1) from cook_material
+        <where>
+            material_name = #{materialName}
+            <if test="materialId != null and materialId != ''"> and material_id != #{materialId}</if>
+            <if test="goodsType != null "> and cm.goods_type = #{goodsType}</if>
+        </where>
     </select>
 
     <select id="checkIsUse" resultType="java.lang.Integer">
-        select count(1) from cook_dishes_material where cm.goods_type = 1 and material_id
-        in
-        <foreach item="materialId" collection="materialIds" open="(" separator="," close=")">
-            #{materialId}
-        </foreach>
+        select count(1) from cook_dishes_material
+        <where>
+            material_id in
+            <foreach item="materialId" collection="materialIds" open="(" separator="," close=")">
+                #{materialId}
+            </foreach>
+            <if test="goodsType != null "> and cm.goods_type = #{goodsType}</if>
+        </where>
     </select>
 
     <insert id="insertCookMaterial" parameterType="com.bonus.canteen.core.cook.domain.CookMaterial" useGeneratedKeys="true" keyProperty="materialId">
diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookMaterialTypeMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookMaterialTypeMapper.xml
index 21f0151..845137e 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookMaterialTypeMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookMaterialTypeMapper.xml
@@ -17,7 +17,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectCookMaterialTypeVo">
-        select material_type_id, material_type_name, parent_id, level, area_id, goods_type, create_by, create_time, update_by, update_time from cook_material_type
+        select material_type_id, material_type_name, parent_id, level, area_id, goods_type,
+               create_by, create_time, update_by, update_time
+        from cook_material_type
     </sql>
 
     <select id="selectCookMaterialTypeList" parameterType="com.bonus.canteen.core.cook.domain.CookMaterialType" resultMap="CookMaterialTypeResult">
@@ -34,28 +36,40 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <select id="selectCookMaterialTypeByMaterialTypeId" parameterType="Long" resultMap="CookMaterialTypeResult">
         <include refid="selectCookMaterialTypeVo"/>
-        where goods_type = 1 and material_type_id = #{materialTypeId}
+        <where>
+            material_type_id = #{materialTypeId}
+            <if test="goodsType != null "> and goods_type = #{goodsType}</if>
+        </where>
     </select>
 
     <select id="selectCookMaterialTypeByMaterialTypeName"
             resultType="com.bonus.canteen.core.cook.domain.CookMaterialType">
         <include refid="selectCookMaterialTypeVo"/>
-        where goods_type = 1 and material_type_name = #{materialTypeName}
-        <if test="materialTypeId != null and materialTypeId != ''">and material_type_id != #{materialTypeId}</if>
+        <where>
+            material_type_name = #{materialTypeName}
+            <if test="materialTypeId != null and materialTypeId != ''">and material_type_id != #{materialTypeId}</if>
+            <if test="goodsType != null "> and goods_type = #{goodsType}</if>
+        </where>
     </select>
 
     <select id="selectCookMaterialTypeByParentId" resultType="java.lang.Integer">
-        select count(1) from cook_material_type where goods_type = 1 and parent_id in
-        <foreach item="materialTypeId" collection="materialTypeIds" open="(" separator="," close=")">
-            #{materialTypeId}
-        </foreach>
+        select count(1) from cook_material_type
+        <where>
+            parent_id in
+            <foreach item="materialTypeId" collection="materialTypeIds" open="(" separator="," close=")">
+                #{materialTypeId}
+            </foreach>
+            <if test="goodsType != null "> and goods_type = #{goodsType}</if>
+        </where>
     </select>
 
     <select id="getTree" resultType="com.bonus.canteen.core.cook.vo.CookMaterialTypeTreeVO">
         select material_type_id as id, parent_id as parentId, material_type_name as categoryName,
                goods_type as categoryType,area_id as areaId
         from cook_material_type
-        where goods_type = 1
+        <where>
+            <if test="goodsType != null "> and goods_type = #{goodsType}</if>
+        </where>
     </select>
 
     <insert id="insertCookMaterialType" parameterType="com.bonus.canteen.core.cook.domain.CookMaterialType" useGeneratedKeys="true" keyProperty="materialTypeId">