菜品管理页面

stdiet-custom/src/main/java/com/stdiet/custom/domain/SysDishes.java

@@ -5,6 +5,8 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 import com.stdiet.common.annotation.Excel;
 import com.stdiet.common.core.domain.BaseEntity;
 
+import java.util.List;
+
 /**
  * 菜品对象 sys_dishes
  * 
@@ -30,6 +32,8 @@ public class SysDishes extends BaseEntity
     @Excel(name = "做法")
     private String methods;
 
+    private List<SysDishesIngredient> igdList;
+
     public void setId(Long id) 
     {
         this.id = id;
@@ -67,6 +71,14 @@ public class SysDishes extends BaseEntity
         return methods;
     }
 
+    public void setIgdList(List<SysDishesIngredient> ingredientList) {
+        this.igdList = ingredientList;
+    }
+
+    public List<SysDishesIngredient> getIgdList() {
+        return igdList;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

stdiet-custom/src/main/java/com/stdiet/custom/domain/SysDishesIngredient.java

@@ -0,0 +1,76 @@
+package com.stdiet.custom.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.math.BigDecimal;
+
+/**
+ * 菜品对象 sys_dishes
+ *
+ * @author wonder
+ * @date 2020-12-28
+ */
+public class SysDishesIngredient extends SysIngredient {
+
+    private Long ingredientId;
+
+    private Long dishesId;
+
+    private Long cusUnit;
+
+    private BigDecimal cusWeight;
+
+    private BigDecimal weight;
+
+    public Long getIngredientId() {
+        return ingredientId;
+    }
+
+    public void setIngredientId(Long ingredientId) {
+        this.ingredientId = ingredientId;
+    }
+
+    public Long getDishesId() {
+        return dishesId;
+    }
+
+    public void setDishesId(Long dishesId) {
+        this.dishesId = dishesId;
+    }
+
+    public BigDecimal getWeight() {
+        return weight;
+    }
+
+    public void setWeight(BigDecimal weight) {
+        this.weight = weight;
+    }
+
+    public BigDecimal getCusWeight() {
+        return cusWeight;
+    }
+
+    public void setCusWeight(BigDecimal cusWeight) {
+        this.cusWeight = cusWeight;
+    }
+
+    public Long getCusUnit() {
+        return cusUnit;
+    }
+
+    public void setCusUnit(Long cusUnit) {
+        this.cusUnit = cusUnit;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("ingredientId", getIngredientId())
+                .append("dishesId", getDishesId())
+                .append("weight", getWeight())
+                .append("cusWeight", getCusWeight())
+                .append("cusUnit", getCusUnit())
+                .toString();
+    }
+}

stdiet-custom/src/main/java/com/stdiet/custom/domain/SysIngredient.java

@@ -33,24 +33,6 @@ public class SysIngredient extends BaseEntity {
     @Excel(name = "食材类别")
     private String type;
 
-    /**
-     * 推荐分量估算
-     */
-    @Excel(name = "推荐分量估算")
-    private Long recEstimation;
-
-    /**
-     * 推荐分量估算单位id
-     */
-    @Excel(name = "推荐分量估算单位id")
-    private Long recEstUnit;
-
-    /**
-     * 推荐分量
-     */
-    @Excel(name = "推荐分量")
-    private Long recPortion;
-
     /**
      * 蛋白质比例
      */
@@ -123,30 +105,6 @@ public class SysIngredient extends BaseEntity {
         this.type = type;
     }
 
-    public Long getRecEstimation() {
-        return recEstimation;
-    }
-
-    public void setRecEstimation(Long recEstimation) {
-        this.recEstimation = recEstimation;
-    }
-
-    public Long getRecEstUnit() {
-        return recEstUnit;
-    }
-
-    public void setRecEstUnit(Long recEstUnit) {
-        this.recEstUnit = recEstUnit;
-    }
-
-    public Long getRecPortion() {
-        return recPortion;
-    }
-
-    public void setRecPortion(Long recPortion) {
-        this.recPortion = recPortion;
-    }
-
     public BigDecimal getProteinRatio() {
         return proteinRatio;
     }
@@ -201,9 +159,6 @@ public class SysIngredient extends BaseEntity {
                 .append("id", getId())
                 .append("name", getName())
                 .append("type", getType())
-                .append("recEstimation", getRecEstimation())
-                .append("recEstUnit", getRecEstUnit())
-                .append("recPortion", getRecPortion())
                 .append("proteinRatio", getProteinRatio())
                 .append("fatRatio", getFatRatio())
                 .append("carbonRatio", getCarbonRatio())