From 04c359a40d51c391fdfea626e7f147422a33b89f Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Fri, 19 Jun 2020 09:43:08 +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 | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 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 df4fc12..c468401 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,7 +1,9 @@
package com.kidgrow.oprationcenter.model;
-import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.kidgrow.common.model.SuperModel;
import lombok.AllArgsConstructor;
import lombok.Data;
@@ -9,6 +11,7 @@
import lombok.NoArgsConstructor;
import org.hibernate.validator.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
import java.util.Date;
/**
@@ -31,12 +34,13 @@
/**
* 需求类型 0就诊数据 1筛查
*/
- @NotEmpty(message = "需求类型 0就诊数据 1筛查不能为空")
+ @NotNull(message = "需求类型 0就诊数据 1筛查不能为空")
private Integer needType;
/**
* 提需求的医生
*/
- @NotEmpty(message = "提需求的医生不能为空")
+ @JsonSerialize(using = ToStringSerializer.class)
+ @NotNull(message = "提需求的医生不能为空")
private Long doctorId;
/**
* 医生姓名
@@ -44,9 +48,19 @@
@NotEmpty(message = "医生姓名不能为空")
private String doctorName;
/**
+ * 医院id
+ */
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long hospitalId;
+ /**
* 医院名称
*/
private String hospitalName;
+ /**
+ * 科室id
+ */
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long departmentId;
/**
* 科室名称
*/
@@ -58,12 +72,14 @@
/**
* 需求数据的开始时间
*/
- @NotEmpty(message = "需求数据的开始时间不能为空")
+ @NotNull(message = "需求数据的开始时间不能为空")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date needBegintime;
/**
* 需求数据的结束时间
*/
- @NotEmpty(message = "需求数据的结束时间不能为空")
+ @NotNull(message = "需求数据的结束时间不能为空")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date needEndtime;
/**
* 需求标签
@@ -73,7 +89,6 @@
/**
* 是否删除，1删除（已下载），0未删除（未下载）
*/
- @TableLogic
private Boolean isDel;
/**
* 文件路径
@@ -82,6 +97,7 @@
/**
* 下载时间
*/
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date downTime;
/**
* 状态，1已上传了数据文件，0未处理
--
Gitblit v1.8.0