Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

调整更换记录

Browse Source
This commit is contained in:
huangdeliang
2021-04-13 19:46:49 +08:00
parent 88fcdbb3d1
commit 7326c487d9
4 changed files with 306 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
stdiet-custom/src/main/java/com/stdiet/custom/domain/SysOrderNutritionistReplaceRecord.java
View File

@ -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;
}

50
stdiet-custom/src/main/resources/mapper/custom/SysOrderNutritionistReplaceRecordMapper.xml
View File

@ -5,37 +5,42 @@
<mapper namespace="com.stdiet.custom.mapper.SysOrderNutritionistReplaceRecordMapper">
<resultMap type="SysOrderNutritionistReplaceRecord" id="SysOrderNutritionistReplaceRecordResult">
<result property="id" column="id" />
<result property="orderId" column="order_id" />
<result property="nutritionistId" column="nutritionist_id" />
<result property="afterSaleId" column="after_sale_id" />
<result property="startTime" column="start_time" />
<result property="createTime" column="create_time" />
<result property="createBy" column="create_by" />
<result property="updateTime" column="update_time" />
<result property="updateBy" column="update_by" />
<result property="delFlag" column="del_flag" />
<result property="id" column="id"/>
<result property="orderId" column="order_id"/>
<result property="nutritionistId" column="nutritionist_id"/>
<result property="nutriAssisId" column="nutri_assis_id"/>
<result property="afterSaleId" column="after_sale_id"/>
<result property="startTime" column="start_time"/>
<result property="createTime" column="create_time"/>
<result property="createBy" column="create_by"/>
<result property="updateTime" column="update_time"/>
<result property="updateBy" column="update_by"/>
<result property="delFlag" column="del_flag"/>
<!-- 非持久化字段 -->
<result property="afterSale" column="after_sale" />
<result property="nutritionist" column="nutritionist" />
<result property="afterSale" column="after_sale"/>
<result property="nutritionist" column="nutritionist"/>
<result property="nutriAssis" column="nutri_assis"/>
</resultMap>
<sql id="selectSysOrderNutritionistReplaceRecordVo">
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
</sql>
<select id="selectSysOrderNutritionistReplaceRecordList" parameterType="SysOrderNutritionistReplaceRecord" resultMap="SysOrderNutritionistReplaceRecordResult">
<select id="selectSysOrderNutritionistReplaceRecordList" parameterType="SysOrderNutritionistReplaceRecord"
resultMap="SysOrderNutritionistReplaceRecordResult">
<include refid="selectSysOrderNutritionistReplaceRecordVo"/>
where o.del_flag = 0 and o.order_id = #{orderId}
</select>
<select id="selectSysOrderNutritionistReplaceRecordById" parameterType="Long" resultMap="SysOrderNutritionistReplaceRecordResult">
<select id="selectSysOrderNutritionistReplaceRecordById" parameterType="Long"
resultMap="SysOrderNutritionistReplaceRecordResult">
<include refid="selectSysOrderNutritionistReplaceRecordVo"/>
where o.id = #{id} and o.del_flag = 0
</select>
@ -47,6 +52,7 @@
<if test="orderId != null">order_id,</if>
<if test="nutritionistId != null">nutritionist_id,</if>
<if test="afterSaleId != null">after_sale_id,</if>
<if test="nutriAssisId != null">nutri_assis_id,</if>
<if test="startTime != null">start_time,</if>
<if test="createTime != null">create_time,</if>
<if test="createBy != null">create_by,</if>
@ -59,6 +65,7 @@
<if test="orderId != null">#{orderId},</if>
<if test="nutritionistId != null">#{nutritionistId},</if>
<if test="afterSaleId != null">#{afterSaleId},</if>
<if test="nutriAssisId != null">#{nutriAssisId},</if>
<if test="startTime != null">#{startTime},</if>
<if test="createTime != null">#{createTime},</if>
<if test="createBy != null">#{createBy},</if>
@ -74,6 +81,7 @@
<if test="orderId != null">order_id = #{orderId},</if>
<if test="nutritionistId != null">nutritionist_id = #{nutritionistId},</if>
<if test="afterSaleId != null">after_sale_id = #{afterSaleId},</if>
<if test="nutriAssisId != null">nutri_assis_id = #{nutriAssisId},</if>
<if test="startTime != null">start_time = #{startTime},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="createBy != null">create_by = #{createBy},</if>
@ -95,8 +103,10 @@
</foreach>
</update>
<select id="getSysOrderReplaceRecordByOrderId" parameterType="Long" resultMap="SysOrderNutritionistReplaceRecordResult">
select id, order_id, nutritionist_id, after_sale_id, start_time, create_time, create_by from sys_order_nutritionist_replace_record
<select id="getSysOrderReplaceRecordByOrderId" parameterType="Long"
resultMap="SysOrderNutritionistReplaceRecordResult">
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
<if test="orderId != null">
and order_id = #{orderId}