From 0562fbb9425809d08da538da95b2eb9dd6992834 Mon Sep 17 00:00:00 2001
From: jjLv <1981429112@qq.com>
Date: Mon, 23 Jun 2025 17:26:49 +0800
Subject: [PATCH 1/4] =?UTF-8?q?0623bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canteen/core/cook/service/impl/CookDishesServiceImpl.java   | 2 +-
 .../src/main/resources/mapper/cook/CookNutritionTypeMapper.xml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/service/impl/CookDishesServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/service/impl/CookDishesServiceImpl.java
index 2fa591f..7f44fa4 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/service/impl/CookDishesServiceImpl.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/service/impl/CookDishesServiceImpl.java
@@ -220,7 +220,7 @@ public class CookDishesServiceImpl implements ICookDishesService {
             log.debug("总和: {}", nutritionEntity.getCalcium());
             System.err.println("总和：" + nutritionEntity.getCalcium());
             //计算营养成分
-            countNum(nutritionEntity, Double.valueOf(cookDishes.getWeight() + ""));
+//            countNum(nutritionEntity, Double.valueOf(cookDishes.getWeight() + ""));
             System.err.println("计算后：" + nutritionEntity.getCalcium());
             log.debug("计算后: {}", nutritionEntity.getCalcium());
             cookDishesMapper.updateFinalNutrition(nutritionEntity, cookDishes.getDishesId());
diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookNutritionTypeMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookNutritionTypeMapper.xml
index 691ef66..37d7162 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookNutritionTypeMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookNutritionTypeMapper.xml
@@ -36,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             resultType="com.bonus.canteen.core.cook.domain.CookNutritionType">
         <include refid="selectCookNutritionTypeVo"/>
         where nutrition_type_name = #{nutritionTypeName}
-        <if test="nutritionTypeId != null and nutritionTypeId != '' "> and parent_id = #{nutritionTypeId}</if>
+        <if test="nutritionTypeId != null and nutritionTypeId != '' "> and nutrition_type_id != #{nutritionTypeId}</if>
         limit 1
     </select>
     <select id="checkIsExistChildren" resultType="java.lang.Integer">

From dc64b1b099a45dab5798ad4f963f54bc522339dd Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Mon, 23 Jun 2025 17:27:39 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bonus/canteen/core/kitchen/domain/KitchenSubPlace.java   | 2 ++
 .../main/resources/mapper/kitchen/KitchenSubPlaceMapper.xml  | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenSubPlace.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenSubPlace.java
index 014712c..340a91c 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenSubPlace.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenSubPlace.java
@@ -40,6 +40,8 @@ public class KitchenSubPlace extends BaseEntity {
 
     private String canteenName;
 
+    private Long areaId;
+
     private String areaName;
 
     /** 仓库id */
diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenSubPlaceMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenSubPlaceMapper.xml
index dee5413..cd9146a 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenSubPlaceMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenSubPlaceMapper.xml
@@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="imgUrl"    column="img_url"    />
         <result property="canteenId"    column="canteen_id"    />
         <result property="canteenName"    column="canteen_name"    />
+        <result property="areaId"    column="area_id"    />
         <result property="areaName"    column="area_name"    />
         <result property="warehouseId"    column="warehouse_id"    />
         <result property="createBy"    column="create_by"    />
@@ -18,8 +19,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectKitchenSubPlaceVo">
-        select ksp.sub_place_id, ksp.sub_place_name, ksp.img_url, ksp.canteen_id, ksp.warehouse_id,
-               ksp.create_by, ksp.create_time, ksp.update_by, ksp.update_time, bc.canteen_name, ba.area_name
+        select ksp.sub_place_id, ksp.sub_place_name, ksp.img_url, ksp.canteen_id, ksp.warehouse_id, ksp.create_by,
+               ksp.create_time, ksp.update_by, ksp.update_time, bc.canteen_name, ba.area_name, ba.area_id
         from kitchen_sub_place ksp
         left join basic_canteen bc on bc.canteen_id = ksp.canteen_id
         left join basic_area ba on ba.area_id = bc.area_id

From eb80b04134216da7145129c26b90fd004608522f Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Mon, 23 Jun 2025 17:29:34 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kitchen/controller/KitchenSubPlaceController.java     | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/controller/KitchenSubPlaceController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/controller/KitchenSubPlaceController.java
index 46de61d..6b8afdf 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/controller/KitchenSubPlaceController.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/controller/KitchenSubPlaceController.java
@@ -49,6 +49,14 @@ public class KitchenSubPlaceController extends BaseController {
         return getDataTable(list);
     }
 
+    @ApiOperation(value = "查询厨房位置信息列表(不分页)")
+    //@RequiresPermissions("kitchen:place:list")
+    @GetMapping("/listAll")
+    public TableDataInfo listAll(KitchenSubPlace kitchenSubPlace) {
+        List<KitchenSubPlace> list = kitchenSubPlaceService.selectKitchenSubPlaceList(kitchenSubPlace);
+        return getDataTable(list);
+    }
+
     /**
      * 导出厨房位置信息列表
      */

From cc18c9f36e154de99d8235d5a1b5291421227d4e Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Mon, 23 Jun 2025 17:51:41 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E8=8F=9C=E8=B0=B1=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cook/mapper/CookRecipeDishesMapper.java   |  2 +
 .../service/impl/CookRecipeServiceImpl.java   | 60 ++++++++++---------
 .../mapper/cook/CookRecipeDishesMapper.xml    | 11 ++++
 3 files changed, 45 insertions(+), 28 deletions(-)

diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/mapper/CookRecipeDishesMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/mapper/CookRecipeDishesMapper.java
index e8b8cd3..a376b82 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/mapper/CookRecipeDishesMapper.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/mapper/CookRecipeDishesMapper.java
@@ -37,6 +37,8 @@ public interface CookRecipeDishesMapper {
      */
     public int insertCookRecipeDishes(CookRecipeDishes cookRecipeDishes);
 
+    public int batchInsertCookRecipeDishes(@Param("list") List<CookRecipeDishes> dishesList);
+
     /**
      * 修改菜品计划菜品关联
      *
diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/service/impl/CookRecipeServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/service/impl/CookRecipeServiceImpl.java
index 3e0b105..8e3d1b1 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/service/impl/CookRecipeServiceImpl.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/service/impl/CookRecipeServiceImpl.java
@@ -342,6 +342,7 @@ public class CookRecipeServiceImpl implements ICookRecipeService {
         }
         cookRecipeDetailMapper.insertCookRecipeDetail(cookRecipeDetail); //插入菜谱之执行计划
         List<CookRecipeDishesDTO> dishesList = detailDTO.getDishesList();
+        List<CookRecipeDishes> newDishesList = new ArrayList<>();
         for (CookRecipeDishesDTO dishesDTO : dishesList) {
             CookRecipeDishes cookRecipeDishes = new CookRecipeDishes();
             BeanUtils.copyProperties(dishesDTO, cookRecipeDishes);
@@ -354,8 +355,9 @@ public class CookRecipeServiceImpl implements ICookRecipeService {
             cookRecipeDishes.setSaleNum(saleNum);
             cookRecipeDishes.setRemanentNum((int) (supplyNum - saleNum));
             cookRecipeDishes.setRecipeDetailId(cookRecipeDetail.getRecipeDetailId());
-            cookRecipeDishesMapper.insertCookRecipeDishes(cookRecipeDishes);  //插入菜谱之菜品详情
+            newDishesList.add(cookRecipeDishes);
         }
+        cookRecipeDishesMapper.batchInsertCookRecipeDishes(newDishesList);  //插入菜谱之菜品详情
     }
 
     private void deleteOldCookRecipeDetailsAndDishes(CookRecipeDTO cookRecipeDTO) {
@@ -553,33 +555,35 @@ public class CookRecipeServiceImpl implements ICookRecipeService {
                         //List<CookRecipeDishes> recipeDishesV2List = Lists.newArrayList();
                         for (Long recipeId : recipeMap.keySet()) {
                             List<CookRecipeDetail> cookRecipeDetailList = detailMap.get(recipeId);
-                            for (CookRecipeDetail oldDetail : cookRecipeDetailList) {
-                                Long oldDetailId = oldDetail.getRecipeDetailId();
-                                CookRecipeDetail newRecipeDetail = new CookRecipeDetail();
-                                newRecipeDetail.setCreateBy("JOB");
-                                newRecipeDetail.setCreateTime(DateUtils.getNowDate());
-                                newRecipeDetail.setRecipeId(recipeId);
-                                Long recipeType = recipeTypeMap.get(recipeId);
-                                if (ObjectUtil.equal(recipeType, RecipeTypeEnum.WEEKLY.key())) {
-                                    newRecipeDetail.setApplyWeek((long)applyDate.getDayOfWeek().getValue());
-                                }
-                                newRecipeDetail.setApplyDate(applyDate);
-                                newRecipeDetail.setDetailType(RecipeDetailTypeEnum.DETAIL_DATA.key());
-                                newRecipeDetail.setMealtimeType(oldDetail.getMealtimeType());
-                                newRecipeDetail.setSaleTypeId(oldDetail.getSaleTypeId());
-                                cookRecipeDetailMapper.insertCookRecipeDetail(newRecipeDetail); //插入菜谱之执行计划
-                                Long newDetailId = newRecipeDetail.getRecipeDetailId();
-                                List<CookRecipeDishes> dishes = recipeDishes.get(oldDetailId);
-                                for (CookRecipeDishes dishesDTO : dishes) {
-                                    CookRecipeDishes newRecipeDishes = new CookRecipeDishes();
-                                    BeanUtils.copyProperties(dishesDTO, newRecipeDishes);
-                                    newRecipeDishes.setCreateBy("JOB");
-                                    newRecipeDishes.setCreateTime(DateUtils.getNowDate());
-                                    long supplyNum = Objects.isNull(newRecipeDishes.getSupplyNum()) ? 0 : newRecipeDishes.getSupplyNum();
-                                    long saleNum = Objects.isNull(newRecipeDishes.getSaleNum()) ? 0 : newRecipeDishes.getSaleNum();
-                                    newRecipeDishes.setRemanentNum((int) (supplyNum - saleNum));
-                                    newRecipeDishes.setRecipeDetailId(newDetailId);
-                                    cookRecipeDishesMapper.insertCookRecipeDishes(newRecipeDishes);  //插入菜谱之菜品详情
+                            if (!CollectionUtils.isEmpty(cookRecipeDetailList)) {
+                                for (CookRecipeDetail oldDetail : cookRecipeDetailList) {
+                                    Long oldDetailId = oldDetail.getRecipeDetailId();
+                                    CookRecipeDetail newRecipeDetail = new CookRecipeDetail();
+                                    newRecipeDetail.setCreateBy("JOB");
+                                    newRecipeDetail.setCreateTime(DateUtils.getNowDate());
+                                    newRecipeDetail.setRecipeId(recipeId);
+                                    Long recipeType = recipeTypeMap.get(recipeId);
+                                    if (ObjectUtil.equal(recipeType, RecipeTypeEnum.WEEKLY.key())) {
+                                        newRecipeDetail.setApplyWeek((long) applyDate.getDayOfWeek().getValue());
+                                    }
+                                    newRecipeDetail.setApplyDate(applyDate);
+                                    newRecipeDetail.setDetailType(RecipeDetailTypeEnum.DETAIL_DATA.key());
+                                    newRecipeDetail.setMealtimeType(oldDetail.getMealtimeType());
+                                    newRecipeDetail.setSaleTypeId(oldDetail.getSaleTypeId());
+                                    cookRecipeDetailMapper.insertCookRecipeDetail(newRecipeDetail); //插入菜谱之执行计划
+                                    Long newDetailId = newRecipeDetail.getRecipeDetailId();
+                                    List<CookRecipeDishes> dishes = recipeDishes.get(oldDetailId);
+                                    for (CookRecipeDishes dishesDTO : dishes) {
+                                        CookRecipeDishes newRecipeDishes = new CookRecipeDishes();
+                                        BeanUtils.copyProperties(dishesDTO, newRecipeDishes);
+                                        newRecipeDishes.setCreateBy("JOB");
+                                        newRecipeDishes.setCreateTime(DateUtils.getNowDate());
+                                        long supplyNum = Objects.isNull(newRecipeDishes.getSupplyNum()) ? 0 : newRecipeDishes.getSupplyNum();
+                                        long saleNum = Objects.isNull(newRecipeDishes.getSaleNum()) ? 0 : newRecipeDishes.getSaleNum();
+                                        newRecipeDishes.setRemanentNum((int) (supplyNum - saleNum));
+                                        newRecipeDishes.setRecipeDetailId(newDetailId);
+                                        cookRecipeDishesMapper.insertCookRecipeDishes(newRecipeDishes);  //插入菜谱之菜品详情
+                                    }
                                 }
                             }
                         }
diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookRecipeDishesMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookRecipeDishesMapper.xml
index e800807..36f02e7 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookRecipeDishesMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookRecipeDishesMapper.xml
@@ -96,6 +96,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
 
+    <insert id="batchInsertCookRecipeDishes" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
+        insert into cook_recipe_dishes (recipe_detail_id, dishes_id, price, sale_price, size_type, supply_num, sale_num,
+                                        remanent_num, limit_num, chef_id, recommend_flag, create_by, create_time)
+        VALUES
+        <foreach collection="list" item="item" separator=",">
+            (#{item.recipeDetailId}, #{item.dishesId}, #{item.price}, #{item.salePrice}, #{item.sizeType},
+             #{item.supplyNum}, #{item.saleNum}, #{item.remanentNum}, #{item.limitNum}, #{item.chefId}, #{item.recommendFlag},
+             #{item.createBy}, #{item.createTime})
+        </foreach>
+    </insert>
+
     <update id="updateCookRecipeDishes" parameterType="com.bonus.canteen.core.cook.domain.CookRecipeDishes">
         update cook_recipe_dishes
         <trim prefix="SET" suffixOverrides=",">