diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysDishes.java b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysDishes.java index f4b9f2b81..18126b743 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysDishes.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysDishes.java @@ -32,6 +32,16 @@ public class SysDishes extends BaseEntity @Excel(name = "做法") private String methods; + private String reviewStatus; + + public void setReviewStatus(String reviewStatus) { + this.reviewStatus = reviewStatus; + } + + public String getReviewStatus() { + return reviewStatus; + } + private List igdList; public void setId(Long id) diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysDishesIngredient.java b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysDishesIngredient.java index fec0ce9db..a65eedd56 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysDishesIngredient.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysDishesIngredient.java @@ -23,6 +23,18 @@ public class SysDishesIngredient extends SysIngredient { private BigDecimal weight; + private String remark; + + @Override + public void setRemark(String remark) { + this.remark = remark; + } + + @Override + public String getRemark() { + return remark; + } + public Long getIngredientId() { return ingredientId; } diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysDishesMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysDishesMapper.xml index c13007261..fbe886550 100644 --- a/stdiet-custom/src/main/resources/mapper/custom/SysDishesMapper.xml +++ b/stdiet-custom/src/main/resources/mapper/custom/SysDishesMapper.xml @@ -9,6 +9,7 @@ + @@ -31,7 +32,7 @@ - select id, name, type, methods, create_by, create_time, update_by, update_time from sys_dishes + select id, name, type, methods, create_by, create_time, update_by, update_time, review_status from sys_dishes @@ -86,6 +88,7 @@ type, methods, create_by, + review_status create_time, update_by, update_time, @@ -95,6 +98,7 @@ #{type}, #{methods}, #{createBy}, + #{reviewStatus} #{createTime}, #{updateBy}, #{updateTime}, @@ -108,6 +112,7 @@ type = #{type}, methods = #{methods}, create_by = #{createBy}, + review_status = #{reviewStatus}, create_time = #{createTime}, update_by = #{updateBy}, update_time = #{updateTime}, @@ -138,9 +143,9 @@ - insert into sys_dishes_ingredient(dishes_id, ingredient_id, ingredient_weight, cus_unit, cus_weight) values + insert into sys_dishes_ingredient(dishes_id, ingredient_id, ingredient_weight, cus_unit, cus_weight, remark) values - (#{item.dishesId}, #{item.ingredientId}, #{item.weight}, #{item.cusUnit}, #{item.cusWeight}) + (#{item.dishesId}, #{item.ingredientId}, #{item.weight}, #{item.cusUnit}, #{item.cusWeight}, #{item.remark}) diff --git a/stdiet-ui/src/views/custom/dishes/index.vue b/stdiet-ui/src/views/custom/dishes/index.vue index 96949db02..d7f5c88cf 100644 --- a/stdiet-ui/src/views/custom/dishes/index.vue +++ b/stdiet-ui/src/views/custom/dishes/index.vue @@ -20,6 +20,20 @@ /> + + + + + 搜索 重置 @@ -49,7 +63,6 @@ -