i国网：一周菜谱

bonus-modules/bonus-smart-canteen/src/main/resources/mapper/zhhq/ZhhqCookRecipeMapper.xml

@@ -4,6 +4,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.bonus.canteen.core.zhhq.mapper.ZhhqCookRecipeMapper">
     <resultMap id="WeekRecipeDetailVO" type="com.bonus.canteen.core.zhhq.domain.WeekRecipeDetailVO">
+        <result property="recipeId" column="recipe_id"/>
+        <result property="menuDate" column="apply_date"/>
         <result property="mealType" column="mealtime_type"/>
         <result property="typeName" column="type_name"/>
         <result property="dishesId" column="dishes_id"/>
@@ -26,9 +28,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectWeekRecipeDetail" resultMap="WeekRecipeDetailVO">
         select
+        mrd.apply_date,
         mrd.mealtime_type,
         if(md.meal_type = 2, 2, mdt.dishes_type_id) as type_id,
         if(md.meal_type = 2, '套餐', mdt.dishes_type_name) as type_name,
+        mr.recipe_id,
         md.dishes_id as base_dishes_id,
         md.dishes_id,
         md.dishes_name,
@@ -57,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join basic_canteen ac on mr.canteen_id = ac.canteen_id
         left join basic_stall ass on mr.stall_id = ass.stall_id
         where
-        1 = 1
+        mrd.detail_type = 2
         <if test="weekDates != null and weekDates.size() > 0">
             and mrd.apply_date in
             <foreach collection="weekDates" item="applyDate" open="(" separator="," close=")">
@@ -71,7 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </foreach>
         </if>
         order by
-        md.dishes_id asc
+        mrd.apply_date, md.dishes_id asc
     </select>
 
     <select id="getCookMaterialById" resultType="com.bonus.canteen.core.zhhq.domain.WeekRecipeIngredientVO">