From ab519a9257f546707b34a9e5494ac58f237a65bd Mon Sep 17 00:00:00 2001 From: huangdeliang Date: Mon, 12 Apr 2021 18:22:44 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=9B=BE=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../custom/recipesBuild/InfoView/DailyAnalyzeCom/index.vue | 2 -- 1 file changed, 2 deletions(-) diff --git a/stdiet-ui/src/views/custom/recipesBuild/InfoView/DailyAnalyzeCom/index.vue b/stdiet-ui/src/views/custom/recipesBuild/InfoView/DailyAnalyzeCom/index.vue index 69206c729..9009490a7 100644 --- a/stdiet-ui/src/views/custom/recipesBuild/InfoView/DailyAnalyzeCom/index.vue +++ b/stdiet-ui/src/views/custom/recipesBuild/InfoView/DailyAnalyzeCom/index.vue @@ -12,14 +12,12 @@ :data="caloriesSource" type="calories" width="364px" - :subTitle="subTitle" /> 查看全部 Date: Tue, 13 Apr 2021 19:46:49 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=9B=B4=E6=8D=A2?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SysOrderNutritionistReplaceRecord.java | 12 +- ...ysOrderNutritionistReplaceRecordMapper.xml | 50 +- .../src/components/OrderDrawer/index.vue | 19 +- .../OrderNutritionistReplaceRecord/index.vue | 483 ++++++++++-------- 4 files changed, 306 insertions(+), 258 deletions(-) diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysOrderNutritionistReplaceRecord.java b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysOrderNutritionistReplaceRecord.java index 8679fbc8c..8385c5a41 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysOrderNutritionistReplaceRecord.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysOrderNutritionistReplaceRecord.java @@ -25,13 +25,14 @@ public class SysOrderNutritionistReplaceRecord extends BaseEntity private Long orderId; /** 更换的营养师ID */ - @Excel(name = "更换的营养师ID") private Long nutritionistId; /** 更换的售后ID */ - @Excel(name = "更换的售后ID") private Long afterSaleId; + /** 更换的售后ID */ + private Long nutriAssisId; + /** 开始时间 */ @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd") @@ -41,8 +42,15 @@ public class SysOrderNutritionistReplaceRecord extends BaseEntity private Integer delFlag; // 售后 + @Excel(name = "售后") private String afterSale; //营养师 + @Excel(name = "营养师") private String nutritionist; + + @Excel(name = "营养师助理") + private String nutriAssis; + + } \ No newline at end of file diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysOrderNutritionistReplaceRecordMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysOrderNutritionistReplaceRecordMapper.xml index e6df40495..3297c6826 100644 --- a/stdiet-custom/src/main/resources/mapper/custom/SysOrderNutritionistReplaceRecordMapper.xml +++ b/stdiet-custom/src/main/resources/mapper/custom/SysOrderNutritionistReplaceRecordMapper.xml @@ -5,37 +5,42 @@ - - - - - - - - - - + + + + + + + + + + + - - + + + - select o.id, o.order_id, o.nutritionist_id, o.after_sale_id, o.start_time, o.create_time, o.create_by, - su_sale.nick_name as after_sale, su_nutritionist.nick_name as nutritionist + select o.id, o.order_id, o.nutritionist_id, o.after_sale_id, o.nutri_assis_id, o.start_time, o.create_time, o.create_by, + su_sale.nick_name as after_sale, su_nutritionist.nick_name as nutritionist, su_nutriAssis.nick_name as nutri_assis from sys_order_nutritionist_replace_record o - left join sys_user su_sale on su_sale.user_id = o.after_sale_id and su_sale.del_flag = 0 - left join sys_user su_nutritionist on su_nutritionist.user_id = o.nutritionist_id and su_nutritionist.del_flag = 0 + left join sys_user su_sale on su_sale.user_id = o.after_sale_id + left join sys_user su_nutritionist on su_nutritionist.user_id = o.nutritionist_id + left join sys_user su_nutriAssis on su_nutriAssis.user_id = o.nutri_assis_id - where o.del_flag = 0 and o.order_id = #{orderId} - where o.id = #{id} and o.del_flag = 0 @@ -47,6 +52,7 @@ order_id, nutritionist_id, after_sale_id, + nutri_assis_id, start_time, create_time, create_by, @@ -59,6 +65,7 @@ #{orderId}, #{nutritionistId}, #{afterSaleId}, + #{nutriAssisId}, #{startTime}, #{createTime}, #{createBy}, @@ -74,6 +81,7 @@ order_id = #{orderId}, nutritionist_id = #{nutritionistId}, after_sale_id = #{afterSaleId}, + nutri_assis_id = #{nutriAssisId}, start_time = #{startTime}, create_time = #{createTime}, create_by = #{createBy}, @@ -95,8 +103,10 @@ - + select id, order_id, nutritionist_id, after_sale_id, nutri_assis_id, start_time, create_time, create_by from + sys_order_nutritionist_replace_record where del_flag = 0 and order_id = #{orderId} diff --git a/stdiet-ui/src/components/OrderDrawer/index.vue b/stdiet-ui/src/components/OrderDrawer/index.vue index ebaf76048..d50e0d286 100644 --- a/stdiet-ui/src/components/OrderDrawer/index.vue +++ b/stdiet-ui/src/components/OrderDrawer/index.vue @@ -5,7 +5,7 @@ :close-on-press-escape="false" :visible.sync="visible" @closed="handleOnClosed" - size="40%" + size="50%" >
@@ -60,7 +60,8 @@ prop="orderTypeName" align="center" width="160" - > + /> + - + @@ -130,7 +127,9 @@ - +