From 7ea2a2cfe922c9b2d5c09c737d10a7f1ab5b50d1 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Mon, 01 Mar 2021 14:14:35 +0800
Subject: [PATCH] Merge branch 'dev1.1' into dev
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysDepartment.java | 85 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 74 insertions(+), 11 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 efa6b8c..7233ebe 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,17 +1,17 @@
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;
/**
@@ -39,24 +39,87 @@
/**
* 组织Id
*/
- @NotEmpty(message = "组织Id不能为空")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long orgId;
/**
* 负责的销售代表
*/
- @NotEmpty(message = "负责的销售代表不能为空")
+ @NotNull(message = "服务代表不能为空")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long serverUserId;
/**
* 销售代表的名字
*/
- @NotEmpty(message = "销售代表的名字不能为空")
+ @NotEmpty(message = "服务代表的名字不能为空")
private String serverUserName;
/**
- * 科室/部门简介
+ * 销售代表电话
*/
- private String departmentAbout;
+ 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;
+
+ /**
+ * 部门联系人
+ */
+ private String departmentLink;
+
+ /**
+ * 部门联系人电话
+ */
+ private String departmentTel;
+
+ /**
+ * 是否筛查科室 0为否 1 为是
+ */
+ private Byte isScreen;
+ /**
+ * 是否新筛查端 0为否 1 为是
+ */
+ private Byte isNewScreenclient;
+
}
--
Gitblit v1.8.0