mirror of
https://gitee.com/dromara/RuoYi-Vue-Plus.git
synced 2026-09-19 17:58:17 +08:00
报餐表添加新字段
This commit is contained in:
parent
baf88a0ea4
commit
2eff99e3c0
@ -125,4 +125,12 @@ public class FtReportMealsDao implements Serializable {
|
|||||||
* 当前报餐总价
|
* 当前报餐总价
|
||||||
*/
|
*/
|
||||||
private BigDecimal totalPrice;
|
private BigDecimal totalPrice;
|
||||||
|
|
||||||
|
private Boolean vegetables;
|
||||||
|
|
||||||
|
private Boolean meat;
|
||||||
|
|
||||||
|
private Boolean rice;
|
||||||
|
|
||||||
|
private Integer egg;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -28,7 +28,11 @@
|
|||||||
c.nutrition_food_flag,
|
c.nutrition_food_flag,
|
||||||
c.is_replace_food,
|
c.is_replace_food,
|
||||||
c.nutrition_food_price,
|
c.nutrition_food_price,
|
||||||
c.total_price
|
c.total_price,
|
||||||
|
c.vegetables,
|
||||||
|
c.meat,
|
||||||
|
c.rice,
|
||||||
|
c.egg
|
||||||
from ft_patient a
|
from ft_patient a
|
||||||
LEFT JOIN ft_depart b on a.depart_id = b.depart_id
|
LEFT JOIN ft_depart b on a.depart_id = b.depart_id
|
||||||
RIGHT JOIN ft_report_meals c on a.patient_id = c.patient_id
|
RIGHT JOIN ft_report_meals c on a.patient_id = c.patient_id
|
||||||
@ -51,6 +55,10 @@
|
|||||||
<result property="isReplaceFood" column="is_replace_food"></result>
|
<result property="isReplaceFood" column="is_replace_food"></result>
|
||||||
<result property="nutritionFoodPrice" column="nutrition_food_price"></result>
|
<result property="nutritionFoodPrice" column="nutrition_food_price"></result>
|
||||||
<result property="totalPrice" column="total_price"></result>
|
<result property="totalPrice" column="total_price"></result>
|
||||||
|
<result property="vegetables" column="vegetables"></result>
|
||||||
|
<result property="meat" column="meat"></result>
|
||||||
|
<result property="rice" column="rice"></result>
|
||||||
|
<result property="egg" column="egg"></result>
|
||||||
</collection>
|
</collection>
|
||||||
</resultMap>
|
</resultMap>
|
||||||
|
|
||||||
@ -69,7 +77,11 @@
|
|||||||
c.nutrition_food_flag,
|
c.nutrition_food_flag,
|
||||||
c.is_replace_food,
|
c.is_replace_food,
|
||||||
c.nutrition_food_price,
|
c.nutrition_food_price,
|
||||||
c.total_price
|
c.total_price,
|
||||||
|
c.vegetables,
|
||||||
|
c.meat,
|
||||||
|
c.rice,
|
||||||
|
c.egg
|
||||||
from ft_patient a
|
from ft_patient a
|
||||||
LEFT JOIN ft_depart b on a.depart_id = b.depart_id
|
LEFT JOIN ft_depart b on a.depart_id = b.depart_id
|
||||||
RIGHT JOIN ft_report_meals c on a.patient_id = c.patient_id
|
RIGHT JOIN ft_report_meals c on a.patient_id = c.patient_id
|
||||||
|
|||||||
@ -21,6 +21,10 @@
|
|||||||
<result property="isReplaceFood" column="is_replace_food"/>
|
<result property="isReplaceFood" column="is_replace_food"/>
|
||||||
<result property="nutritionFoodPrice" column="nutrition_food_price"/>
|
<result property="nutritionFoodPrice" column="nutrition_food_price"/>
|
||||||
<result property="totalPrice" column="total_price"/>
|
<result property="totalPrice" column="total_price"/>
|
||||||
|
<result property="vegetables" column="vegetables"/>
|
||||||
|
<result property="meat" column="meat"/>
|
||||||
|
<result property="rice" column="rice"/>
|
||||||
|
<result property="egg" column="egg"/>
|
||||||
</resultMap>
|
</resultMap>
|
||||||
|
|
||||||
<select id="listMealsWithInSettle" resultType="com.ruoyi.system.fantang.domain.FtReportMealsDao">
|
<select id="listMealsWithInSettle" resultType="com.ruoyi.system.fantang.domain.FtReportMealsDao">
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user