食品管理添加用餐类型字段

ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtFoodDaoController.java

@@ -1,31 +1,23 @@
 package com.ruoyi.system.fantang.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-
-import java.util.List;
-import java.util.Arrays;
-
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.ruoyi.common.utils.StringUtils;
-import lombok.RequiredArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.fantang.domain.FtFoodDao;
 import com.ruoyi.system.fantang.service.IFtFoodDaoService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
+import lombok.RequiredArgsConstructor;
-import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * 食品管理Controller
@@ -45,8 +37,7 @@ public class FtFoodDaoController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('fantang:food:list')")
     @GetMapping("/list")
-    public TableDataInfo list(FtFoodDao ftFoodDao)
+    public TableDataInfo list(FtFoodDao ftFoodDao) {
-    {
         startPage();
         LambdaQueryWrapper<FtFoodDao> lqw = Wrappers.lambdaQuery(ftFoodDao);
         if (StringUtils.isNotBlank(ftFoodDao.getName())) {

ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtFoodDao.java

@@ -1,19 +1,16 @@
 package com.ruoyi.system.fantang.domain;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.annotation.Excel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-import com.ruoyi.common.annotation.Excel;
+
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
 import java.io.Serializable;
-import java.util.Date;
 import java.math.BigDecimal;
-import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 食品管理对象 ft_food
@@ -32,25 +29,42 @@ public class FtFoodDao implements Serializable {
     private static final long serialVersionUID = 1L;
 
 
-    /** 食品id */
+    /**
+     * 食品id
+     */
     @TableId(value = "food_id")
     private Long foodId;
 
-    /** 名称 */
+    /**
+     * 名称
+     */
     @Excel(name = "名称")
     private String name;
 
-    /** 图片 */
+    /**
+     * 图片
+     */
     private String pictureUrl;
 
-    /** 售价 */
+    /**
+     * 售价
+     */
     @Excel(name = "售价")
     private BigDecimal price;
 
-    /** 启用标志 */
+    /**
+     * 启用标志
+     */
     private Long flag;
 
-    /** 食品分类 */
+    /**
+     * 食品分类
+     */
     @Excel(name = "食品分类")
     private Long type;
+
+    /**
+     * 用餐类型
+     */
+    private Integer dinnerType;
 }

ruoyi-system/src/main/resources/mapper/fantang/FtFoodDaoMapper.xml

@@ -11,6 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="price" column="price"/>
         <result property="flag" column="flag"/>
         <result property="type" column="type"/>
+        <result property="dinnerType" column="dinner_type"/>
     </resultMap>