Commit 3e6e4807 by lpx

# 商家端行程报价和完成行程后给APP用户推送信息

parent 40276b79
package com.jumeirah.api.app.entity.param; package com.jumeirah.api.app.entity.param;
import com.jumeirah.common.entity.base.ImgJson;
import io.geekidea.springbootplus.framework.common.entity.BaseEntity; import io.geekidea.springbootplus.framework.common.entity.BaseEntity;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
...@@ -10,6 +11,7 @@ import lombok.experimental.Accessors; ...@@ -10,6 +11,7 @@ import lombok.experimental.Accessors;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.List;
/** /**
* 行程表 * 行程表
...@@ -40,9 +42,8 @@ public class StrokeAddMedicalTreatmentParam extends BaseEntity { ...@@ -40,9 +42,8 @@ public class StrokeAddMedicalTreatmentParam extends BaseEntity {
@ApiModelProperty("病人疾病名称") @ApiModelProperty("病人疾病名称")
private String diseaseName; private String diseaseName;
@NotBlank(message = "病人病情诊断书不能为空")
@ApiModelProperty("病人病情诊断书") @ApiModelProperty("病人病情诊断书")
private String medicalCertificateUrl; private List<ImgJson> medicalCertificateUrl;
@ApiModelProperty("配备器械(格式:1,2,3)逗号分隔") @ApiModelProperty("配备器械(格式:1,2,3)逗号分隔")
private String instruments; private String instruments;
......
package com.jumeirah.common.entity; package com.jumeirah.common.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
import com.jumeirah.common.entity.base.ImgJson;
import io.geekidea.springbootplus.framework.common.entity.BaseEntity; import io.geekidea.springbootplus.framework.common.entity.BaseEntity;
import io.geekidea.springbootplus.framework.core.validator.groups.Update; import io.geekidea.springbootplus.framework.core.validator.groups.Update;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
...@@ -15,6 +19,7 @@ import javax.validation.constraints.NotBlank; ...@@ -15,6 +19,7 @@ import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.List;
/** /**
* 行程表 * 行程表
...@@ -26,6 +31,7 @@ import java.sql.Timestamp; ...@@ -26,6 +31,7 @@ import java.sql.Timestamp;
@Accessors(chain = true) @Accessors(chain = true)
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@ApiModel(value = "Stroke对象") @ApiModel(value = "Stroke对象")
@TableName(autoResultMap = true)
public class Stroke extends BaseEntity { public class Stroke extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -96,8 +102,9 @@ public class Stroke extends BaseEntity { ...@@ -96,8 +102,9 @@ public class Stroke extends BaseEntity {
@ApiModelProperty("病人疾病名称") @ApiModelProperty("病人疾病名称")
private String diseaseName; private String diseaseName;
@TableField(typeHandler = FastjsonTypeHandler.class)
@ApiModelProperty("病人病情诊断书") @ApiModelProperty("病人病情诊断书")
private String medicalCertificateUrl; private List<ImgJson> medicalCertificateUrl;
@ApiModelProperty("配备器械(格式:1,2,3)逗号分隔") @ApiModelProperty("配备器械(格式:1,2,3)逗号分隔")
private String instruments; private String instruments;
......
package com.jumeirah.common.vo; package com.jumeirah.common.vo;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
import com.jumeirah.common.entity.base.ImgJson;
import io.geekidea.springbootplus.framework.core.validator.groups.Update; import io.geekidea.springbootplus.framework.core.validator.groups.Update;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
...@@ -14,6 +18,7 @@ import javax.validation.constraints.NotNull; ...@@ -14,6 +18,7 @@ import javax.validation.constraints.NotNull;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.List;
/** /**
* <pre> * <pre>
...@@ -26,6 +31,7 @@ import java.sql.Timestamp; ...@@ -26,6 +31,7 @@ import java.sql.Timestamp;
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
@ApiModel(value = "StrokeDetailVo对象") @ApiModel(value = "StrokeDetailVo对象")
@TableName(autoResultMap = true)
public class StrokeDetailVo implements Serializable { public class StrokeDetailVo implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -96,8 +102,9 @@ public class StrokeDetailVo implements Serializable { ...@@ -96,8 +102,9 @@ public class StrokeDetailVo implements Serializable {
@ApiModelProperty("病人疾病名称") @ApiModelProperty("病人疾病名称")
private String diseaseName; private String diseaseName;
@TableField(typeHandler = FastjsonTypeHandler.class)
@ApiModelProperty("病人病情诊断书") @ApiModelProperty("病人病情诊断书")
private String medicalCertificateUrl; private List<ImgJson> medicalCertificateUrl;
@ApiModelProperty("配备器械(格式:1,2,3)逗号分隔") @ApiModelProperty("配备器械(格式:1,2,3)逗号分隔")
private String instruments; private String instruments;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment