diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/domain/CookDishes.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/domain/CookDishes.java index b97b7fb..759c39f 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/domain/CookDishes.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/domain/CookDishes.java @@ -380,7 +380,8 @@ public class CookDishes extends BaseEntity { private BigDecimal phosphorus; private BigDecimal selenium; private String salesNum; - + @ApiModelProperty(value = "胡萝卜素(μg/100g)") + private BigDecimal carotene; diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookDishesMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookDishesMapper.xml index 8f18fb4..7026cc4 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookDishesMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookDishesMapper.xml @@ -90,6 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -131,7 +132,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" vitamin_e, magnesium, zinc, glycemic_index, sort, cd.canteen_id,bc.canteen_name,cd.shopstall_id,bs.stall_name, hide_flag, convert_flag, material_cost, gross_profit, gross_profit_rate, public_dishes, cd.area_id,ba.area_name, meal_id, cd.create_by, cd.create_time, cd.update_by, cd.update_time, cd.processing_method, cd.processing_time, cd.edible, cd.water, cd.ash, cd.retinol, cd.thiamine, cd.riboflavin, cd.niacin, vitamin_d, - cd.phosphorus, cd.selenium + cd.phosphorus, cd.selenium,cd.carotene from cook_dishes cd left join basic_area ba on cd.area_id = ba.area_id left join basic_canteen bc on cd.canteen_id = bc.canteen_id @@ -375,6 +376,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" vitamin_d, phosphorus, selenium, + carotene, #{mealType}, @@ -457,6 +459,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{vitaminD}, #{phosphorus}, #{selenium}, + #{carotene}, @@ -551,6 +554,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" vitamin_d = #{vitaminD}, phosphorus = #{phosphorus}, selenium = #{selenium}, + carotene = #{carotene}, where dishes_id = #{dishesId} @@ -588,6 +592,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" vitamin_d = #{bean.vitaminD}, processing_method = #{bean.processingMethod}, processing_time = #{bean.processingTime}, + carotene = #{bean.carotene}, where dishes_id = #{dishesId}