菜品评价

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/controller/MenuEvaluaDetailController.java

@@ -68,9 +68,9 @@ public class MenuEvaluaDetailController extends BaseController {
      */
     @ApiOperation(value = "获取订单评价菜品详细信息")
     //@RequiresPermissions("menu:detail:query")
-    @GetMapping(value = "/{id}")
+    @GetMapping(value = "/{detailId}")
-    public AjaxResult getInfo(@PathVariable("id") Long id) {
+    public AjaxResult getInfo(@PathVariable("detailId") Long detailId) {
-        return success(menuEvaluaDetailService.selectMenuEvaluaDetailById(id));
+        return success(menuEvaluaDetailService.selectMenuEvaluaDetailById(detailId));
     }
 
     /**
@@ -112,8 +112,8 @@ public class MenuEvaluaDetailController extends BaseController {
     //@PreventRepeatSubmit
     //@RequiresPermissions("menu:detail:remove")
     @SysLog(title = "订单评价菜品", businessType = OperaType.DELETE, logType = 1,module = "仓储管理->删除订单评价菜品")
-	@PostMapping("/del/{ids}")
+	@PostMapping("/del/{detailIds}")
-    public AjaxResult remove(@PathVariable Long[] ids) {
+    public AjaxResult remove(@PathVariable Long[] detailIds) {
-        return toAjax(menuEvaluaDetailService.deleteMenuEvaluaDetailByIds(ids));
+        return toAjax(menuEvaluaDetailService.deleteMenuEvaluaDetailByIds(detailIds));
     }
 }

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/controller/MenuEvaluaOrderController.java

@@ -70,9 +70,9 @@ public class MenuEvaluaOrderController extends BaseController {
      */
     @ApiOperation(value = "获取订单评价详细信息")
     //@RequiresPermissions("menu:order:query")
-    @GetMapping(value = "/{id}")
+    @GetMapping(value = "/{evaluaId}")
-    public AjaxResult getInfo(@PathVariable("id") Long id) {
+    public AjaxResult getInfo(@PathVariable("evaluaId") Long evaluaId) {
-        return success(menuEvaluaOrderService.selectMenuEvaluaOrderById(id));
+        return success(menuEvaluaOrderService.selectMenuEvaluaOrderById(evaluaId));
     }
 
     /**

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/domain/MenuEvaluaDetail.java

@@ -19,9 +19,6 @@ import com.bonus.common.core.web.domain.BaseEntity;
 public class MenuEvaluaDetail extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** 主键id */
-    private Long id;
-
     /** 详情id */
     @Excel(name = "详情id")
     @ApiModelProperty(value = "详情id")

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/domain/MenuEvaluaOrder.java

@@ -21,9 +21,6 @@ import com.bonus.common.core.web.domain.BaseEntity;
 public class MenuEvaluaOrder extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** 主键id */
-    private Long id;
-
     /** 评价id */
     @Excel(name = "评价id")
     @ApiModelProperty(value = "评价id")

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/mapper/MenuEvaluaDetailMapper.java

@@ -13,10 +13,10 @@ public interface MenuEvaluaDetailMapper {
     /**
      * 查询订单评价菜品
      * 
-     * @param id 订单评价菜品主键
+     * @param detailId 订单评价菜品主键
      * @return 订单评价菜品
      */
-    public MenuEvaluaDetail selectMenuEvaluaDetailById(Long id);
+    public MenuEvaluaDetail selectMenuEvaluaDetailById(Long detailId);
 
     /**
      * 查询订单评价菜品列表
@@ -45,16 +45,16 @@ public interface MenuEvaluaDetailMapper {
     /**
      * 删除订单评价菜品
      * 
-     * @param id 订单评价菜品主键
+     * @param detailId 订单评价菜品主键
      * @return 结果
      */
-    public int deleteMenuEvaluaDetailById(Long id);
+    public int deleteMenuEvaluaDetailById(Long detailId);
 
     /**
      * 批量删除订单评价菜品
      * 
-     * @param ids 需要删除的数据主键集合
+     * @param detailIds 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteMenuEvaluaDetailByIds(Long[] ids);
+    public int deleteMenuEvaluaDetailByIds(Long[] detailIds);
 }

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/mapper/MenuEvaluaOrderMapper.java

@@ -14,10 +14,10 @@ public interface MenuEvaluaOrderMapper {
     /**
      * 查询订单评价
      * 
-     * @param id 订单评价主键
+     * @param evaluaId 订单评价主键
      * @return 订单评价
      */
-    public MenuEvaluaOrder selectMenuEvaluaOrderById(Long id);
+    public MenuEvaluaOrder selectMenuEvaluaOrderById(Long evaluaId);
 
     /**
      * 查询订单评价列表
@@ -46,16 +46,16 @@ public interface MenuEvaluaOrderMapper {
     /**
      * 删除订单评价
      * 
-     * @param id 订单评价主键
+     * @param evaluaId 订单评价主键
      * @return 结果
      */
-    public int deleteMenuEvaluaOrderById(Long id);
+    public int deleteMenuEvaluaOrderById(Long evaluaId);
 
     /**
      * 批量删除订单评价
      * 
-     * @param ids 需要删除的数据主键集合
+     * @param evaluaIds 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteMenuEvaluaOrderByIds(Long[] ids);
+    public int deleteMenuEvaluaOrderByIds(Long[] evaluaIds);
 }

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuEvaluaDetailServiceImpl.java

@@ -23,12 +23,12 @@ public class MenuEvaluaDetailServiceImpl implements IMenuEvaluaDetailService {
     /**
      * 查询订单评价菜品
      * 
-     * @param id 订单评价菜品主键
+     * @param detailId 订单评价菜品主键
      * @return 订单评价菜品
      */
     @Override
-    public MenuEvaluaDetail selectMenuEvaluaDetailById(Long id) {
+    public MenuEvaluaDetail selectMenuEvaluaDetailById(Long detailId) {
-        return menuEvaluaDetailMapper.selectMenuEvaluaDetailById(id);
+        return menuEvaluaDetailMapper.selectMenuEvaluaDetailById(detailId);
     }
 
     /**
@@ -77,22 +77,22 @@ public class MenuEvaluaDetailServiceImpl implements IMenuEvaluaDetailService {
     /**
      * 批量删除订单评价菜品
      *
-     * @param ids 需要删除的订单评价菜品主键
+     * @param detailIds 需要删除的订单评价菜品主键
      * @return 结果
      */
     @Override
-    public int deleteMenuEvaluaDetailByIds(Long[] ids) {
+    public int deleteMenuEvaluaDetailByIds(Long[] detailIds) {
-        return menuEvaluaDetailMapper.deleteMenuEvaluaDetailByIds(ids);
+        return menuEvaluaDetailMapper.deleteMenuEvaluaDetailByIds(detailIds);
     }
 
     /**
      * 删除订单评价菜品信息
      * 
-     * @param id 订单评价菜品主键
+     * @param detailId 订单评价菜品主键
      * @return 结果
      */
     @Override
-    public int deleteMenuEvaluaDetailById(Long id) {
+    public int deleteMenuEvaluaDetailById(Long detailId) {
-        return menuEvaluaDetailMapper.deleteMenuEvaluaDetailById(id);
+        return menuEvaluaDetailMapper.deleteMenuEvaluaDetailById(detailId);
     }
 }

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuEvaluaOrderServiceImpl.java

@@ -79,22 +79,22 @@ public class MenuEvaluaOrderServiceImpl implements IMenuEvaluaOrderService {
     /**
      * 批量删除订单评价
      * 
-     * @param ids 需要删除的订单评价主键
+     * @param evaluaIds 需要删除的订单评价主键
      * @return 结果
      */
     @Override
-    public int deleteMenuEvaluaOrderByIds(Long[] ids) {
+    public int deleteMenuEvaluaOrderByIds(Long[] evaluaIds) {
-        return menuEvaluaOrderMapper.deleteMenuEvaluaOrderByIds(ids);
+        return menuEvaluaOrderMapper.deleteMenuEvaluaOrderByIds(evaluaIds);
     }
 
     /**
      * 删除订单评价信息
      * 
-     * @param id 订单评价主键
+     * @param evaluaId 订单评价主键
      * @return 结果
      */
     @Override
-    public int deleteMenuEvaluaOrderById(Long id) {
+    public int deleteMenuEvaluaOrderById(Long evaluaId) {
-        return menuEvaluaOrderMapper.deleteMenuEvaluaOrderById(id);
+        return menuEvaluaOrderMapper.deleteMenuEvaluaOrderById(evaluaId);
     }
 }

bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuEvaluaDetailMapper.xml

@@ -4,7 +4,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.bonus.canteen.core.menu.mapper.MenuEvaluaDetailMapper">
     <resultMap type="com.bonus.canteen.core.menu.domain.MenuEvaluaDetail" id="MenuEvaluaDetailResult">
-        <result property="id"    column="id"    />
         <result property="detailId"    column="detail_id"    />
         <result property="evaluaId"    column="evalua_id"    />
         <result property="mealType"    column="meal_type"    />
@@ -19,7 +18,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectMenuEvaluaDetailVo">
-        select id, detail_id, evalua_id, meal_type, meal_id, star_level, description, revision, create_by, create_time, update_by, update_time from menu_evalua_detail
+        select detail_id, evalua_id, meal_type, meal_id, star_level, description,
+               revision, create_by, create_time, update_by, update_time
+        from menu_evalua_detail
     </sql>
 
     <select id="selectMenuEvaluaDetailList" parameterType="com.bonus.canteen.core.menu.domain.MenuEvaluaDetail" resultMap="MenuEvaluaDetailResult">
@@ -37,13 +38,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <select id="selectMenuEvaluaDetailById" parameterType="Long" resultMap="MenuEvaluaDetailResult">
         <include refid="selectMenuEvaluaDetailVo"/>
-        where id = #{id}
+        where detail_id = #{detailId}
     </select>
         
-    <insert id="insertMenuEvaluaDetail" parameterType="com.bonus.canteen.core.menu.domain.MenuEvaluaDetail" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertMenuEvaluaDetail" parameterType="com.bonus.canteen.core.menu.domain.MenuEvaluaDetail" useGeneratedKeys="true" keyProperty="detailId">
         insert into menu_evalua_detail
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="detailId != null">detail_id,</if>
             <if test="evaluaId != null">evalua_id,</if>
             <if test="mealType != null">meal_type,</if>
             <if test="mealId != null">meal_id,</if>
@@ -56,7 +56,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="detailId != null">#{detailId},</if>
             <if test="evaluaId != null">#{evaluaId},</if>
             <if test="mealType != null">#{mealType},</if>
             <if test="mealId != null">#{mealId},</if>
@@ -73,7 +72,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateMenuEvaluaDetail" parameterType="com.bonus.canteen.core.menu.domain.MenuEvaluaDetail">
         update menu_evalua_detail
         <trim prefix="SET" suffixOverrides=",">
-            <if test="detailId != null">detail_id = #{detailId},</if>
             <if test="evaluaId != null">evalua_id = #{evaluaId},</if>
             <if test="mealType != null">meal_type = #{mealType},</if>
             <if test="mealId != null">meal_id = #{mealId},</if>
@@ -85,17 +83,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
         </trim>
-        where id = #{id}
+        where detail_id = #{detailId}
     </update>
 
     <delete id="deleteMenuEvaluaDetailById" parameterType="Long">
-        delete from menu_evalua_detail where id = #{id}
+        delete from menu_evalua_detail where detail_id = #{detailId}
     </delete>
 
     <delete id="deleteMenuEvaluaDetailByIds" parameterType="String">
-        delete from menu_evalua_detail where id in 
+        delete from menu_evalua_detail where detail_id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
+            #{detailId}
         </foreach>
     </delete>
 </mapper>

bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuEvaluaOrderMapper.xml

@@ -4,7 +4,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.bonus.canteen.core.menu.mapper.MenuEvaluaOrderMapper">
     <resultMap type="com.bonus.canteen.core.menu.domain.MenuEvaluaOrder" id="MenuEvaluaOrderResult">
-        <result property="id"    column="id"    />
         <result property="evaluaId"    column="evalua_id"    />
         <result property="ordId"    column="ord_id"    />
         <result property="starLevel"    column="star_level"    />
@@ -23,7 +22,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectMenuEvaluaOrderVo">
-        select id, evalua_id, ord_id, star_level, description, reply, reply_time, shopstall_id, show_flag, del_flag, revision, order_evalua_type, create_by, create_time, update_by, update_time from menu_evalua_order
+        select evalua_id, ord_id, star_level, description, reply, reply_time,
+               shopstall_id, show_flag, del_flag, revision, order_evalua_type,
+               create_by, create_time, update_by, update_time
+        from menu_evalua_order
     </sql>
 
     <select id="selectMenuEvaluaOrderList" parameterType="com.bonus.canteen.core.menu.domain.MenuEvaluaOrder" resultMap="MenuEvaluaOrderResult">
@@ -44,13 +46,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <select id="selectMenuEvaluaOrderById" parameterType="Long" resultMap="MenuEvaluaOrderResult">
         <include refid="selectMenuEvaluaOrderVo"/>
-        where id = #{id}
+        where evalua_id = #{evaluaId}
     </select>
         
-    <insert id="insertMenuEvaluaOrder" parameterType="com.bonus.canteen.core.menu.dto.MenuEvaluaOrderAddDTO" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertMenuEvaluaOrder" parameterType="com.bonus.canteen.core.menu.dto.MenuEvaluaOrderAddDTO" useGeneratedKeys="true" keyProperty="evaluaId">
         insert into menu_evalua_order
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="evaluaId != null">evalua_id,</if>
             <if test="ordId != null">ord_id,</if>
             <if test="starLevel != null">star_level,</if>
             <if test="description != null and description != ''">description,</if>
@@ -67,7 +68,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="evaluaId != null">#{evaluaId},</if>
             <if test="ordId != null">#{ordId},</if>
             <if test="starLevel != null">#{starLevel},</if>
             <if test="description != null and description != ''">#{description},</if>
@@ -88,7 +88,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateMenuEvaluaOrder" parameterType="com.bonus.canteen.core.menu.domain.MenuEvaluaOrder">
         update menu_evalua_order
         <trim prefix="SET" suffixOverrides=",">
-            <if test="evaluaId != null">evalua_id = #{evaluaId},</if>
             <if test="ordId != null">ord_id = #{ordId},</if>
             <if test="starLevel != null">star_level = #{starLevel},</if>
             <if test="description != null and description != ''">description = #{description},</if>
@@ -104,17 +103,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
         </trim>
-        where id = #{id}
+        where evalua_id = #{evaluaId}
     </update>
 
     <delete id="deleteMenuEvaluaOrderById" parameterType="Long">
-        delete from menu_evalua_order where id = #{id}
+        delete from menu_evalua_order where evalua_id = #{evaluaId}
     </delete>
 
     <delete id="deleteMenuEvaluaOrderByIds" parameterType="String">
-        delete from menu_evalua_order where id in 
+        delete from menu_evalua_order where evalua_id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
+            #{evaluaId}
         </foreach>
     </delete>
 </mapper>