diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtNutritionFoodDaoController.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtNutritionFoodDaoController.java index 9396d7c48..5f997016d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtNutritionFoodDaoController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtNutritionFoodDaoController.java @@ -82,7 +82,7 @@ public class FtNutritionFoodDaoController extends BaseController { @Log(title = "病患营养配餐", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody FtNutritionFoodDao ftNutritionFoodDao) { - ftNutritionFoodDao.setFlag(1); +// ftNutritionFoodDao.setFlag(1); return toAjax(iFtNutritionFoodDaoService.save(ftNutritionFoodDao) ? 1 : 0); } @@ -102,7 +102,7 @@ public class FtNutritionFoodDaoController extends BaseController { @PutMapping("/deactivate/{id}") public AjaxResult deactivate(@PathVariable("id") Long id) { FtNutritionFoodDao ftNutritionFoodDao = iFtNutritionFoodDaoService.getById(id); - ftNutritionFoodDao.setFlag(0); + ftNutritionFoodDao.setFlag(false); iFtNutritionFoodDaoService.updateById(ftNutritionFoodDao); return AjaxResult.success("停用成功"); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtNutritionFoodDao.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtNutritionFoodDao.java index dbf360212..f33b408f8 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtNutritionFoodDao.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtNutritionFoodDao.java @@ -1,23 +1,21 @@ 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; +import java.util.Date; /** * 病患营养配餐对象 ft_nutrition_food - * + * * @author ft * @date 2020-12-03 */ @@ -29,28 +27,40 @@ import com.ruoyi.common.core.domain.BaseEntity; @TableName("ft_nutrition_food") public class FtNutritionFoodDao implements Serializable { -private static final long serialVersionUID=1L; + private static final long serialVersionUID = 1L; - /** id */ + /** + * id + */ @TableId(value = "id") private Long id; - /** 营养餐名称 */ + /** + * 营养餐名称 + */ @Excel(name = "营养餐名称") private String name; - /** 价格 */ + /** + * 价格 + */ @Excel(name = "价格") private BigDecimal price; - /** 启用标志 */ + /** + * 启用标志 + */ @Excel(name = "启用标志") - private Integer flag; + private Boolean flag; - /** 创建日期 */ + /** + * 创建日期 + */ private Date createAt; - /** 创建人 */ + /** + * 创建人 + */ private String createBy; } diff --git a/ruoyi-ui/src/views/fantang/nutritionFood/index.vue b/ruoyi-ui/src/views/fantang/nutritionFood/index.vue index 03f207cf7..0efa58d2f 100644 --- a/ruoyi-ui/src/views/fantang/nutritionFood/index.vue +++ b/ruoyi-ui/src/views/fantang/nutritionFood/index.vue @@ -1,39 +1,5 @@