From cb9bc5daaa7ee5978c07d5107d3301473617f367 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Sat, 25 Jul 2020 17:14:42 +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/ProductOrder.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ProductOrder.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ProductOrder.java
index 32c138c..42f4dff 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ProductOrder.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ProductOrder.java
@@ -1,6 +1,10 @@
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;
@@ -8,6 +12,7 @@
import lombok.NoArgsConstructor;
import org.hibernate.validator.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
import java.util.Date;
/**
@@ -30,7 +35,8 @@
/**
* 医院标识id
*/
- @NotEmpty(message = "医院标识id不能为空")
+ @NotNull(message = "医院标识id不能为空")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long hospitalId;
/**
* 医院名称
@@ -40,7 +46,8 @@
/**
* 科室ID
*/
- @NotEmpty(message = "科室ID不能为空")
+ @NotNull(message = "科室ID不能为空")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long departmentId;
/**
* 科室名称
@@ -60,22 +67,29 @@
/**
* 合同开始时间
*/
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date contractBeginTime;
/**
* 合同结束时间
*/
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date contractEndTime;
/**
* 合同签订日期
*/
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date contractTime;
/**
* 是否删除，1删除，0未删除
*/
- @NotEmpty(message = "是否删除，1删除，0未删除不能为空")
+ @TableLogic
private Boolean isDel;
/**
* 状态，1启用，0停用
*/
private Boolean enabled;
+ /**
+ * 创建者的部门
+ */
+ private String createUserOrgCode;
}
--
Gitblit v1.8.0