实体类和Mapper文件添加数据库新增字段
This commit is contained in:
parent
c99a392189
commit
c8228e64d2
@ -0,0 +1,29 @@
|
||||
package com.xinelu.common.enums;
|
||||
|
||||
import lombok.Getter;
|
||||
|
||||
/**
|
||||
* @Description 订单来源枚举
|
||||
* @Author 纪寒
|
||||
* @Date 2023-10-16
|
||||
*/
|
||||
@Getter
|
||||
public enum OrderSourceEnum {
|
||||
|
||||
/**
|
||||
* 泉医模块
|
||||
*/
|
||||
SPRING_DOCTOR("SPRING_DOCTOR"),
|
||||
|
||||
/**
|
||||
* 家医模块
|
||||
*/
|
||||
FAMILY_DOCTOR("FAMILY_DOCTOR"),
|
||||
;
|
||||
|
||||
final private String info;
|
||||
|
||||
OrderSourceEnum(String info) {
|
||||
this.info = info;
|
||||
}
|
||||
}
|
||||
@ -179,6 +179,11 @@ public class GoodsOrder extends BaseDomain implements Serializable {
|
||||
*/
|
||||
private String hospitalPersonName;
|
||||
|
||||
/**
|
||||
* 专家咨询信息表id
|
||||
*/
|
||||
private Long consultationInfoId;
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
|
||||
|
||||
@ -96,6 +96,10 @@ public class OrderEvaluateInfo extends BaseDomain implements Serializable {
|
||||
@NotNull(message = "请选择评分", groups = {Update.class})
|
||||
private Integer compositeScore;
|
||||
|
||||
/**
|
||||
* 订单来源,泉医模块:SPRING_DOCTOR,家医模块:FAMILY_DOCTOR
|
||||
*/
|
||||
private String orderSource;
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
|
||||
@ -19,6 +19,7 @@ import javax.validation.constraints.NotBlank;
|
||||
import javax.validation.constraints.NotNull;
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/**
|
||||
* 被护理人基本信息对象 patient_info
|
||||
@ -247,6 +248,23 @@ public class PatientInfo extends BaseDomain implements Serializable {
|
||||
*/
|
||||
private String disease;
|
||||
|
||||
/**
|
||||
* 绑定城市(1:德州 2:东营)
|
||||
*/
|
||||
private String cityCode;
|
||||
|
||||
/**
|
||||
* 小程序绑定时间
|
||||
*/
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private LocalDateTime bindingTime;
|
||||
|
||||
/**
|
||||
* 当前是否选中(0: 否 1:是)
|
||||
*/
|
||||
private String isChecked;
|
||||
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
|
||||
@ -275,6 +293,9 @@ public class PatientInfo extends BaseDomain implements Serializable {
|
||||
.append("loginFlag", getLoginFlag())
|
||||
.append("primaryAccountFlag", getPrimaryAccountFlag())
|
||||
.append("delFlag", getDelFlag())
|
||||
.append("cityCode", getCityCode())
|
||||
.append("bindingTime", getBindingTime())
|
||||
.append("isChecked", getIsChecked())
|
||||
.toString();
|
||||
}
|
||||
}
|
||||
|
||||
@ -34,6 +34,7 @@
|
||||
<result property="healthConsultationContent" column="health_consultation_content"/>
|
||||
<result property="healthAppointDate" column="health_appoint_date"/>
|
||||
<result property="hospitalPersonName" column="hospital_person_name"/>
|
||||
<result property="consultationInfoId" column="consultation_info_id"/>
|
||||
</resultMap>
|
||||
|
||||
<!--商品订单信息及评价-->
|
||||
@ -117,7 +118,8 @@
|
||||
original_total_price,
|
||||
health_consultation_content,
|
||||
health_appoint_date,
|
||||
hospital_person_name
|
||||
hospital_person_name,
|
||||
consultation_info_id
|
||||
from goods_order
|
||||
</sql>
|
||||
|
||||
@ -273,6 +275,8 @@
|
||||
</if>
|
||||
<if test="hospitalPersonName != null">hospital_person_name,
|
||||
</if>
|
||||
<if test="consultationInfoId != null">consultation_info_id,
|
||||
</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="nurseStationId != null">#{nurseStationId},
|
||||
@ -331,6 +335,8 @@
|
||||
</if>
|
||||
<if test="hospitalPersonName != null">#{hospitalPersonName},
|
||||
</if>
|
||||
<if test="consultationInfoId != null">#{consultationInfoId},
|
||||
</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
@ -421,6 +427,9 @@
|
||||
<if test="hospitalPersonName != null">hospital_person_name =
|
||||
#{hospitalPersonName},
|
||||
</if>
|
||||
<if test="consultationInfoId != null">consultation_info_id =
|
||||
#{consultationInfoId},
|
||||
</if>
|
||||
</trim>
|
||||
where id = #{id}
|
||||
</update>
|
||||
|
||||
@ -22,6 +22,8 @@
|
||||
<result property="createTime" column="create_time"/>
|
||||
<result property="updateBy" column="update_by"/>
|
||||
<result property="updateTime" column="update_time"/>
|
||||
<result property="personAccount" column="person_account"/>
|
||||
<result property="personPassword" column="person_password"/>
|
||||
</resultMap>
|
||||
|
||||
<resultMap type="com.xinelu.manage.vo.hospitalpersoninfo.HospitalPersonInfoVO" id="HospitalPersonByIdVO">
|
||||
@ -71,6 +73,8 @@
|
||||
person_introduce,
|
||||
person_sort,
|
||||
person_picture_url,
|
||||
person_account,
|
||||
person_password,
|
||||
create_by,
|
||||
create_time,
|
||||
update_by,
|
||||
@ -238,6 +242,10 @@
|
||||
</if>
|
||||
<if test="personPictureUrl != null">person_picture_url,
|
||||
</if>
|
||||
<if test="personAccount != null">person_account,
|
||||
</if>
|
||||
<if test="personPassword != null">person_password,
|
||||
</if>
|
||||
<if test="createBy != null">create_by,
|
||||
</if>
|
||||
<if test="createTime != null">create_time,
|
||||
@ -270,6 +278,10 @@
|
||||
</if>
|
||||
<if test="personPictureUrl != null">#{personPictureUrl},
|
||||
</if>
|
||||
<if test="personAccount != null">#{personAccount},
|
||||
</if>
|
||||
<if test="personPassword != null">#{personPassword},
|
||||
</if>
|
||||
<if test="createBy != null">#{createBy},
|
||||
</if>
|
||||
<if test="createTime != null">#{createTime},
|
||||
@ -316,6 +328,12 @@
|
||||
<if test="personPictureUrl != null">person_picture_url =
|
||||
#{personPictureUrl},
|
||||
</if>
|
||||
<if test="personAccount != null">person_account =
|
||||
#{personAccount},
|
||||
</if>
|
||||
<if test="personPassword != null">person_password =
|
||||
#{personPassword},
|
||||
</if>
|
||||
<if test="createBy != null">create_by =
|
||||
#{createBy},
|
||||
</if>
|
||||
@ -367,6 +385,12 @@
|
||||
<if test="personPictureUrl != null">person_picture_url =
|
||||
#{personPictureUrl},
|
||||
</if>
|
||||
<if test="personAccount != null">person_account =
|
||||
#{personAccount},
|
||||
</if>
|
||||
<if test="personPassword != null">person_password =
|
||||
#{personPassword},
|
||||
</if>
|
||||
<if test="createBy != null">create_by =
|
||||
#{createBy},
|
||||
</if>
|
||||
|
||||
@ -14,6 +14,7 @@
|
||||
<result property="evaluateChannel" column="evaluate_channel"/>
|
||||
<result property="evaluateSatisfaction" column="evaluate_satisfaction"/>
|
||||
<result property="compositeScore" column="composite_score"/>
|
||||
<result property="orderSource" column="order_source"/>
|
||||
<result property="createBy" column="create_by"/>
|
||||
<result property="createTime" column="create_time"/>
|
||||
<result property="updateBy" column="update_by"/>
|
||||
@ -30,6 +31,7 @@
|
||||
evaluate_channel,
|
||||
evaluate_satisfaction,
|
||||
composite_score,
|
||||
order_source,
|
||||
create_by,
|
||||
create_time,
|
||||
update_by,
|
||||
@ -100,6 +102,8 @@
|
||||
</if>
|
||||
<if test="compositeScore != null">composite_score,
|
||||
</if>
|
||||
<if test="orderSource != null">order_source,
|
||||
</if>
|
||||
<if test="createBy != null">create_by,
|
||||
</if>
|
||||
<if test="createTime != null">create_time,
|
||||
@ -128,6 +132,8 @@
|
||||
</if>
|
||||
<if test="compositeScore != null">#{compositeScore},
|
||||
</if>
|
||||
<if test="orderSource != null">#{orderSource},
|
||||
</if>
|
||||
<if test="createBy != null">#{createBy},
|
||||
</if>
|
||||
<if test="createTime != null">#{createTime},
|
||||
@ -166,6 +172,9 @@
|
||||
<if test="compositeScore != null">composite_score =
|
||||
#{compositeScore},
|
||||
</if>
|
||||
<if test="orderSource != null">order_source =
|
||||
#{orderSource},
|
||||
</if>
|
||||
<if test="createBy != null">create_by =
|
||||
#{createBy},
|
||||
</if>
|
||||
|
||||
@ -42,6 +42,10 @@
|
||||
<result property="personalWechatCodeUrl" column="personal_wechat_code_url"/>
|
||||
<result property="disablingCondition" column="disabling_condition"/>
|
||||
<result property="disablingReason" column="disabling_reason"/>
|
||||
<result property="disease" column="disease"/>
|
||||
<result property="cityCode" column="city_code"/>
|
||||
<result property="bindingTime" column="binding_time"/>
|
||||
<result property="isChecked" column="is_checked"/>
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectPatientInfoVo">
|
||||
@ -77,7 +81,11 @@
|
||||
del_flag,
|
||||
personal_wechat_code_url,
|
||||
disabling_condition,
|
||||
disabling_reason
|
||||
disabling_reason,
|
||||
disease,
|
||||
city_code,
|
||||
binding_time,
|
||||
is_checked
|
||||
from patient_info
|
||||
</sql>
|
||||
|
||||
@ -289,6 +297,14 @@
|
||||
</if>
|
||||
<if test="disablingReason != null">disabling_reason,
|
||||
</if>
|
||||
<if test="disease != null">disease,
|
||||
</if>
|
||||
<if test="cityCode != null">city_code,
|
||||
</if>
|
||||
<if test="bindingTime != null">binding_time,
|
||||
</if>
|
||||
<if test="isChecked != null">is_checked,
|
||||
</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="communityCode != null and communityCode != ''">#{communityCode},
|
||||
@ -361,6 +377,14 @@
|
||||
</if>
|
||||
<if test="disablingReason != null">#{disablingReason},
|
||||
</if>
|
||||
<if test="disease != null">#{disease},
|
||||
</if>
|
||||
<if test="cityCode != null">#{cityCode},
|
||||
</if>
|
||||
<if test="bindingTime != null">#{bindingTime},
|
||||
</if>
|
||||
<if test="isChecked != null">#{isChecked},
|
||||
</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
@ -472,6 +496,18 @@
|
||||
<if test="disablingReason != null">disabling_reason =
|
||||
#{disablingReason},
|
||||
</if>
|
||||
<if test="disease != null">disease =
|
||||
#{disease},
|
||||
</if>
|
||||
<if test="cityCode != null">city_code =
|
||||
#{cityCode},
|
||||
</if>
|
||||
<if test="bindingTime != null">binding_time =
|
||||
#{bindingTime},
|
||||
</if>
|
||||
<if test="isChecked != null">is_checked =
|
||||
#{isChecked},
|
||||
</if>
|
||||
</trim>
|
||||
where id = #{id}
|
||||
</update>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user