From 8190823a593d3123384d3a75774ad19ecea07204 Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Mon, 15 Jun 2020 11:20:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SysProduct.java | 116 ++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 69 insertions(+), 47 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SysProduct.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SysProduct.java
index 4c30319..800b4a7 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SysProduct.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SysProduct.java
@@ -1,26 +1,26 @@
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.TableLogic;
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 javax.validation.constraints.NotNull;
import java.math.BigDecimal;
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)
@@ -28,44 +28,66 @@
@AllArgsConstructor
@TableName("sys_product")
public class SysProduct extends SuperModel {
- private static final long serialVersionUID=1L;
+ private static final long serialVersionUID = 1L;
- /**
- * 产品名称
- */
- @NotBlank(message = "产品名称不能为空")
- private String proName;
- /**
- * 时长(天)
- */
- @NotBlank(message = "时长(天)不能为空")
- private Integer proTime;
- /**
- * 产品类型 0试用 1正式
- */
- @NotBlank(message = "产品类型 0试用 1正式不能为空")
- private Integer proType;
- /**
- * 建议售价
- */
- @NotBlank(message = "建议售价不能为空")
- private BigDecimal proPrice;
- /**
- * 报告量
- */
- @NotBlank(message = "报告量不能为空")
- private Integer recordCount;
- /**
- * 读片量
- */
- @NotBlank(message = "读片量不能为空")
- private Integer ailightCount;
- /**
- * 是否删除，1删除，0未删除
- */
- private Boolean isDel;
- /**
- * 状态，1启用，0停用
- */
- private Boolean enabled;
- }
+ /**
+ * 产品名称
+ */
+ @NotEmpty(message = "产品名称不能为空")
+ private String proName;
+ /**
+ * 时长(天)
+ */
+ @NotNull(message = "时长不能为空")
+ private Integer proTime;
+ /**
+ * 时长单位
+ */
+ @NotNull(message = "时长单位不能为空")
+ private Integer proTimeUnit;
+ /**
+ * 产品类型 0试用 1正式
+ */
+ @NotNull(message = "产品类型 0试用 1正式不能为空")
+ private Integer proType;
+ /**
+ * 建议售价
+ */
+ @NotNull(message = "建议售价不能为空")
+ private BigDecimal proPrice;
+ /**
+ * 报告量
+ */
+ @NotNull(message = "报告量不能为空")
+ private Integer recordCount;
+ /**
+ * 读片量
+ */
+ @NotNull(message = "读片量不能为空")
+ private Integer ailightCount;
+ /**
+ * 是否删除，1删除，0未删除
+ */
+ @TableLogic
+ private Boolean isDel;
+ /**
+ * 状态，1启用，0停用
+ */
+ private Boolean enabled;
+ /**
+ * 产品结束时间-供前端使用
+ */
+ private Date endTime;
+ /**
+ * 产品结束时间-供前端使用
+ */
+ private Date beginTime;
+ /**
+ * 共享，1是，0不
+ */
+ private Boolean isShare;
+ /**
+ * 创建者的部门
+ */
+ private String createUserOrgCode;
+}
--
Gitblit v1.8.0