diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtCateringDaoController.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtCateringDaoController.java index 27263763d..f23046c07 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtCateringDaoController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtCateringDaoController.java @@ -97,6 +97,7 @@ public class FtCateringDaoController extends BaseController { foodDemandDao.setType(type); foodDemandDao.setNutritionFoodId(ftCateringDao.getNumber()); foodDemandDao.setCreateAt(new Date()); + foodDemandDao.setNutritionFoodFlag(0); iFtFoodDemandDaoService.save(foodDemandDao); } else { QueryWrapper wrapper = new QueryWrapper<>(); @@ -105,6 +106,7 @@ public class FtCateringDaoController extends BaseController { FtFoodDemandDao foodDemandDao = iFtFoodDemandDaoService.getOne(wrapper); foodDemandDao.setNutritionFoodId(ftCateringDao.getNumber()); foodDemandDao.setUpdateAt(new Date()); + foodDemandDao.setNutritionFoodFlag(0); iFtFoodDemandDaoService.updateById(foodDemandDao); } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtFoodDemandDao.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtFoodDemandDao.java index abcc64f46..832f53cd8 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtFoodDemandDao.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtFoodDemandDao.java @@ -1,5 +1,6 @@ package com.ruoyi.system.fantang.domain; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; @@ -125,4 +126,10 @@ public class FtFoodDemandDao extends BasePatient implements Serializable { * 营养餐标志 **/ private Integer nutritionFoodFlag; + + /** + * 营养餐名 + */ + @TableField(exist = false) + private String nutritionFood; } diff --git a/ruoyi-system/src/main/resources/mapper/fantang/FtFoodDemandDaoMapper.xml b/ruoyi-system/src/main/resources/mapper/fantang/FtFoodDemandDaoMapper.xml index a4ce26d09..36ff94da4 100644 --- a/ruoyi-system/src/main/resources/mapper/fantang/FtFoodDemandDaoMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/fantang/FtFoodDemandDaoMapper.xml @@ -25,18 +25,37 @@ \ No newline at end of file