From 9a86c4e3283b412e499c683a0b28ed7c9856c55f Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Fri, 27 Nov 2020 11:51:32 +0800
Subject: [PATCH] Merge branch 'dev' of ssh://192.168.2.240:29418/kidgrow-microservices-platform into dev
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ProductOrderDetail.java | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ProductOrderDetail.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ProductOrderDetail.java
index d13c348..633d2fa 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ProductOrderDetail.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ProductOrderDetail.java
@@ -2,6 +2,9 @@
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;
@@ -33,11 +36,13 @@
* 对应product_order表中的id
*/
@NotEmpty(message = "对应product_order表中的id不能为空")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long orderId;
/**
* 产品/明细ID
*/
@NotEmpty(message = "产品/明细ID不能为空")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long proId;
/**
* 产品/明细名称
@@ -45,10 +50,14 @@
@NotEmpty(message = "产品/明细名称不能为空")
private String proName;
/**
- * 产品类型 0试用 1正式
+ * 产品类型 0试用 1正式 3 自定义
*/
@NotNull(message = "产品类型不能为空")
private Integer proType;
+ /**
+ * 产品使用期限限制 1有限制，0 无限制
+ */
+ private Integer termType;
/**
* 是否共享 0否 1是
*/
@@ -61,25 +70,42 @@
@NotEmpty(message = "是否删除，1删除，0未删除不能为空")
private Boolean isDel;
/**
+ * 产品的读片总量
+ */
+ @NotNull(message = "产品的读片总量")
+ private Integer orderAilightCount;
+ /**
+ * 产品的报告总量
+ */
+ @NotNull(message = "产品的报告总量")
+ private Integer orderRecordCount;
+ /**
* 读片量
*/
- @NotEmpty(message = "读片量不能为空")
+ @NotNull(message = "读片量不能为空")
private Integer ailightCount;
+
/**
* 报告量
*/
- @NotEmpty(message = "报告量不能为空")
+ @NotNull(message = "报告量不能为空")
private Integer recordCount;
/**
* 有效的开始时间
*/
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date proBegintime;
/**
* 有效的结束时间
*/
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date proEndtime;
/**
* 状态，1启用，0停用
*/
private Boolean enabled;
+ /**
+ * 创建者的部门
+ */
+ private String createUserOrgCode;
}
--
Gitblit v1.8.0