productDev/dmvisit.git

			@@ -2,6 +2,7 @@

			import com.baomidou.mybatisplus.annotation.TableField;
			import com.doumee.core.annotation.excel.ExcelColumn;
			import com.doumee.core.model.LoginUserModel;
			import io.swagger.annotations.ApiModel;
			import io.swagger.annotations.ApiModelProperty;
			import com.baomidou.mybatisplus.annotation.IdType;
			@@ -20,7 +21,7 @@
			@Data
			@ApiModel("人员信息表")
			@TableName("`member`")
			public class Member {
			public class Member extends LoginUserModel {

			@TableId(type = IdType.AUTO)
			@ApiModelProperty(value = "主键", example = "1")
			@@ -75,13 +76,12 @@
			private String imgurl;

			@ApiModelProperty(value = "类型 0劳务访客 1普通访客 2内部人员", example = "1")
			@ExcelColumn(name="类型 0劳务访客 1普通访客 2内部人员")
			@ExcelColumn(name="类型 0劳务访客 1普通访客 2内部人员")
			private Integer type;

			@ApiModelProperty(value = "访客名称/内部人员")
			@ExcelColumn(name="访客名称")
			private String name;

			@ApiModelProperty(value = "访客年龄")
			@ExcelColumn(name="访客年龄")
			@JsonFormat(pattern = "yyyy-MM-dd")
			@@ -94,6 +94,9 @@
			@ApiModelProperty(value = "身份证号（MD4加密）")
			@ExcelColumn(name="身份证号（MD4加密）")
			private String idcardNo;
			@ApiModelProperty(value = "修改的身份证号 ")
			@TableField(exist = false)
			private String idcardNoNew;

			@ApiModelProperty(value = "证件显示信息")
			@ExcelColumn(name="证件显示信息")
			@@ -145,12 +148,18 @@
			@ApiModelProperty(value = "海康同步状态 0未同步 1已同步 2同步失败 3不符合下发条件 4等待删除权限 ", example = "1")
			@ExcelColumn(name="海康同步状态 0未同步 1已同步 2同步失败 3不符合下发条件 4等待删除权限")
			private Integer hkStatus;
			@ApiModelProperty(value = "海康授权状态 0未授权 1已授权 ", example = "1")
			@ExcelColumn(name="海康授权状态 0未授权 1已授权 ")
			private Integer authStatus;

			@ApiModelProperty(value = "海康最近同步时间")
			@ExcelColumn(name="海康最近同步时间")
			@JsonFormat(pattern = "yyyy-MM-dd")
			private Date hkDate;

			@ApiModelProperty(value = "在职状态 0在职 1离职", example = "1")
			@ExcelColumn(name="在职状态 0在职 1离职")
			private Integer workStatus;
			@ApiModelProperty(value = "ERP标识", example = "1")
			@ExcelColumn(name="ERP标识")
			private String erpId;
			@@ -209,6 +218,21 @@
			@ApiModelProperty(value = "组织名称")
			@TableField(exist = false)
			private String companyName;
			@ApiModelProperty(value = "最后操作人")
			@TableField(exist = false)
			private String editorName;
			@ApiModelProperty(value = "组织类型")
			@TableField(exist = false)
			private Integer companyType;
			@ApiModelProperty(value = "组织编码路径")
			@TableField(exist = false)
			private String companyPath;
			@ApiModelProperty(value = "负责人编码（关联member)")
			@TableField(exist = false)
			private Integer headId;
			@ApiModelProperty(value = "组织路径")
			@TableField(exist = false)
			private String companyNamePath;
			@ApiModelProperty(value = "组织海康编码")
			@TableField(exist = false)
			private String hkOrgId;
			@@ -223,11 +247,19 @@
			@ApiModelProperty(value = "授权门禁组编码集合,【访客端】唯一标识",hidden = true )
			@TableField(exist = false)
			private Integer[] roleIds;
			@ApiModelProperty(value = "人员编码集合,【访客端】唯一标识",hidden = true )
			@TableField(exist = false)
			private List<Integer> ids;
			@ApiModelProperty(value = "有效期类型 0长期有效 1自定义",hidden = true )
			@TableField(exist = false)
			private Integer timeType;

			//暂无使用
			@ApiModelProperty(value = "姓名/手机号/工号")
			@TableField(exist = false)
			private String keyword;



			@ApiModelProperty(value = "是否有人脸：0=无；1=有；")
			@TableField(exist = false)
			@@ -252,4 +284,28 @@
			@ExcelColumn(name="门禁有效期结束",index= 6,dateFormat = "yyyy-MM-dd")
			private Date endTime;

			@ApiModelProperty(value = "人脸照片完整地址")
			@TableField(exist = false)
			private String faceImgFull;
			@ApiModelProperty(value = "人脸照片完整地址")
			@TableField(exist = false)
			private String imgurlFull;
			@ApiModelProperty(value = "是否主管 0否 1是", example = "1")
			@TableField(exist = false)
			private Integer headStatus;

			@ApiModelProperty(value = "门禁角色名称")
			@TableField(exist = false)
			private String roleName;
			@ApiModelProperty(value = "培训开始时间")
			@TableField(exist = false)
			private Date trainStartTime;
			@ApiModelProperty(value = "培训结束时间")
			@TableField(exist = false)
			private Date trainEndTime;

			@ApiModelProperty(value = "门禁组名称集合")
			@TableField(exist = false)
			private List<String> roleNames;

			}