From 91f173b2090c9125e1bdc83c17ad8ef05ee8cf7f Mon Sep 17 00:00:00 2001 From: 克 刘 <4345453@qq.com> Date: Fri, 03 Apr 2020 14:32:22 +0800 Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev --- kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/DataNeed.java | 132 +++++++++++++++++++++---------------------- 1 files changed, 65 insertions(+), 67 deletions(-) diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/DataNeed.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/DataNeed.java index 5df129b..f32429d 100644 --- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/DataNeed.java +++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/DataNeed.java @@ -1,25 +1,23 @@ package com.kidgrow.oprationcenter.model; -import com.kidgrow.common.model.SuperModel; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.kidgrow.common.model.SuperModel; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import org.hibernate.validator.constraints.*; +import org.hibernate.validator.constraints.NotEmpty; + import java.util.Date; /** * 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br> + * + * @version 1.0 * @Description: 医生的数据需求<br> * @Project: 用户中心<br> * @CreateDate: Created in 2020-04-01 09:37:04 <br> * @Author: <a href="4345453@kidgrow.com">liuke</a> - * @version 1.0 */ @Data @EqualsAndHashCode(callSuper = false) @@ -27,64 +25,64 @@ @AllArgsConstructor @TableName("data_need") public class DataNeed extends SuperModel { - private static final long serialVersionUID=1L; + private static final long serialVersionUID = 1L; - /** - * 需求类型 0就诊数据 1筛查 - */ - @NotBlank(message = "需求类型 0就诊数据 1筛查不能为空") - private Integer needType; - /** - * 提需求的医生 - */ - @NotBlank(message = "提需求的医生不能为空") - private Long doctorId; - /** - * 医生姓名 - */ - @NotBlank(message = "医生姓名不能为空") - private String doctorName; - /** - * 医院名称 - */ - private String hospitalName; - /** - * 科室名称 - */ - private String departmentName; - /** - * 医生连续方式 - */ - private String doctorTel; - /** - * 需求数据的开始时间 - */ - @NotBlank(message = "需求数据的开始时间不能为空") - private Date needBegintime; - /** - * 需求数据的结束时间 - */ - @NotBlank(message = "需求数据的结束时间不能为空") - private Date needEndtime; - /** - * 需求标签 - */ - @NotBlank(message = "需求标签不能为空") - private String needTags; - /** - * 是否删除,1删除(已下载),0未删除(未下载) - */ - private Boolean isDel; - /** - * 文件路径 - */ - private String dataFile; - /** - * 下载时间 - */ - private Date downTime; - /** - * 状态,1已上传了数据文件,0未处理 - */ - private Boolean enabled; - } + /** + * 需求类型 0就诊数据 1筛查 + */ + @NotEmpty(message = "需求类型 0就诊数据 1筛查不能为空") + private Integer needType; + /** + * 提需求的医生 + */ + @NotEmpty(message = "提需求的医生不能为空") + private Long doctorId; + /** + * 医生姓名 + */ + @NotEmpty(message = "医生姓名不能为空") + private String doctorName; + /** + * 医院名称 + */ + private String hospitalName; + /** + * 科室名称 + */ + private String departmentName; + /** + * 医生连续方式 + */ + private String doctorTel; + /** + * 需求数据的开始时间 + */ + @NotEmpty(message = "需求数据的开始时间不能为空") + private Date needBegintime; + /** + * 需求数据的结束时间 + */ + @NotEmpty(message = "需求数据的结束时间不能为空") + private Date needEndtime; + /** + * 需求标签 + */ + @NotEmpty(message = "需求标签不能为空") + private String needTags; + /** + * 是否删除,1删除(已下载),0未删除(未下载) + */ + private Boolean isDel; + /** + * 文件路径 + */ + private String dataFile; + /** + * 下载时间 + */ + private Date downTime; + /** + * 状态,1已上传了数据文件,0未处理 + */ + private Boolean enabled; +} -- Gitblit v1.8.0