From 2c4189febf04adb1505ad3ed9816d9258fd852b8 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Tue, 24 Nov 2020 12:06:10 +0800
Subject: [PATCH] 添加taocan 的功能
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ProductOrder.java | 135 +++++++++++++++++++++++++--------------------
1 files changed, 75 insertions(+), 60 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 a1cae89..797c2d2 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,25 +1,28 @@
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.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;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
-import org.hibernate.validator.constraints.*;
+import org.hibernate.validator.constraints.NotEmpty;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
import java.util.Date;
/**
* 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
+ *
+ * @version 1.0
* @Description: 产品的充值记录-订单<br>
* @Project: 用户中心<br>
* @CreateDate: Created in 2020-04-01 09:37:05 <br>
* @Author: <a href="4345453@kidgrow.com">liuke</a>
- * @version 1.0
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -27,57 +30,69 @@
@AllArgsConstructor
@TableName("product_order")
public class ProductOrder extends SuperModel {
- private static final long serialVersionUID=1L;
+ private static final long serialVersionUID = 1L;
- /**
- * 医院标识id
- */
- @NotBlank(message = "医院标识id不能为空")
- private Long hospitalId;
- /**
- * 医院名称
- */
- @NotBlank(message = "医院名称不能为空")
- private String hospitalName;
- /**
- * 科室ID
- */
- @NotBlank(message = "科室ID不能为空")
- private Long departmentId;
- /**
- * 科室名称
- */
- @NotBlank(message = "科室名称不能为空")
- private String departmentName;
- /**
- * 合同编号
- */
- @NotBlank(message = "合同编号不能为空")
- private String contractNo;
- /**
- * 合同名称
- */
- @NotBlank(message = "合同名称不能为空")
- private String contractTitle;
- /**
- * 合同开始时间
- */
- private Date contractBeginTime;
- /**
- * 合同结束时间
- */
- private Date contractEndTime;
- /**
- * 合同签订日期
- */
- private Date contractTime;
- /**
- * 是否删除，1删除，0未删除
- */
- @NotBlank(message = "是否删除，1删除，0未删除不能为空")
- private Boolean isDel;
- /**
- * 状态，1启用，0停用
- */
- private Boolean enabled;
- }
+ /**
+ * 医院标识id
+ */
+ @NotNull(message = "医院标识id不能为空")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long hospitalId;
+ /**
+ * 医院名称
+ */
+ @NotEmpty(message = "医院名称不能为空")
+ private String hospitalName;
+ /**
+ * 科室ID
+ */
+ @NotNull(message = "科室ID不能为空")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long departmentId;
+ /**
+ * 科室名称
+ */
+ @NotEmpty(message = "科室名称不能为空")
+ private String departmentName;
+ /**
+ * 合同编号
+ */
+ @NotEmpty(message = "合同编号不能为空")
+ private String contractNo;
+ /**
+ * 合同名称
+ */
+ @NotEmpty(message = "合同名称不能为空")
+ private String contractTitle;
+
+ @NotNull(message = "合同名数量不能为空")
+ @Min(1)
+ private Integer contractNum;
+ /**
+ * 合同开始时间
+ */
+ @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未删除
+ */
+ private Boolean isDel;
+ /**
+ * 状态，1启用，0停用
+ */
+ private Boolean enabled;
+ /**
+ * 创建者的部门
+ */
+ private String createUserOrgCode;
+}
--
Gitblit v1.8.0