From b7265cdd6f3e1fbb0d428c27e5b5e29e34d56953 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Tue, 17 Nov 2020 17:55:21 +0800
Subject: [PATCH] Merge branch 'dev'
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysDepartment.java | 119 +++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 82 insertions(+), 37 deletions(-)
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysDepartment.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysDepartment.java
index b78ca62..aaa7938 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysDepartment.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysDepartment.java
@@ -1,25 +1,27 @@
package com.kidgrow.usercenter.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.NotNull;
import java.util.Date;
/**
* 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
+ *
+ * @version 1.0
* @Description: 科室表<br>
* @Project: 用户中心<br>
* @CreateDate: Created in 2020-04-02 14:02:50 <br>
* @Author: <a href="4345453@kidgrow.com">liuke</a>
- * @version 1.0
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -27,34 +29,77 @@
@AllArgsConstructor
@TableName("sys_department")
public class SysDepartment extends SuperModel {
- private static final long serialVersionUID=1L;
+ private static final long serialVersionUID = 1L;
- /**
- * 科室/部门名称 同组织名称
- */
- @NotBlank(message = "科室/部门名称 同组织名称不能为空")
- private String departmentName;
- /**
- * 组织Id
- */
- @NotBlank(message = "组织Id不能为空")
- private Long orgId;
- /**
- * 负责的销售代表
- */
- @NotBlank(message = "负责的销售代表不能为空")
- private Long serverUserId;
- /**
- * 销售代表的名字
- */
- @NotBlank(message = "销售代表的名字不能为空")
- private String serverUserName;
- /**
- * 科室/部门简介
- */
- private String departmentAbout;
- /**
- * 状态，1启用，0停用
- */
- private Boolean enabled;
- }
+ /**
+ * 科室/部门名称 同组织名称
+ */
+ @NotEmpty(message = "科室/部门名称 同组织名称不能为空")
+ private String departmentName;
+ /**
+ * 组织Id
+ */
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long orgId;
+ /**
+ * 负责的销售代表
+ */
+ @NotNull(message = "服务代表不能为空")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long serverUserId;
+ /**
+ * 销售代表的名字
+ */
+ @NotEmpty(message = "服务代表的名字不能为空")
+ private String serverUserName;
+ /**
+ * 销售代表电话
+ */
+ private String serverUserTel;
+ /**
+ * 状态，1启用，0停用
+ */
+ private Boolean enabled;
+ /**
+ * 是否删除，1删除，0未删除
+ */
+ private Boolean isDel;
+ /**
+ * 负责的销售代表
+ */
+ @NotNull(message = "负责的销售代表不能为空")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long saleUserId;
+ /**
+ * 销售代表的名字
+ */
+ @NotEmpty(message = "销售代表的名字不能为空")
+ private String saleUserName;
+ /**
+ * 销售代表电话
+ */
+ private String saleUserTel;
+ /**
+ * 帐号数量,默认6
+ */
+ private Integer accountsCount;
+ /**
+ * 是否单次支付 1是0否
+ */
+ private Boolean isPay;
+ /**
+ * 运动处方 1是0否
+ */
+ private Boolean isHealth;
+
+ /**
+ * 运动处方服务生效时间
+ */
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ private Date healthBeginTime;
+ /**
+ * 运动处方服务结束时间
+ */
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ private Date healthEndTime;
+}
--
Gitblit v1.8.0