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")
			@@ -74,17 +75,15 @@
			@ExcelColumn(name="健康码")
			private String imgurl;

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

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

			@ApiModelProperty(value = "访客年龄")
			@ExcelColumn(name="访客年龄")
			@JsonFormat(pattern = "yyyy-MM-dd")
			private Date birthday;

			@ApiModelProperty(value = "手机号")
			@@ -94,6 +93,9 @@
			@ApiModelProperty(value = "身份证号（MD4加密）")
			@ExcelColumn(name="身份证号（MD4加密）")
			private String idcardNo;
			@ApiModelProperty(value = "修改的身份证号 ")
			@TableField(exist = false)
			private String idcardNoNew;

			@ApiModelProperty(value = "证件显示信息")
			@ExcelColumn(name="证件显示信息")
			@@ -102,6 +104,9 @@
			@ApiModelProperty(value = "证件类型 0身份证 1港澳证件 2护照", example = "1")
			@ExcelColumn(name="证件类型 0身份证 1港澳证件 2护照")
			private Integer idcardType;
			@ApiModelProperty(value = "是否是物流司机 0不是 1是", example = "1")
			@ExcelColumn(name="是否是物流司机 0不是 1是")
			private Integer isDriver;

			@ApiModelProperty(value = "工号")
			@ExcelColumn(name="工号")
			@@ -135,7 +140,6 @@

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

			@ApiModelProperty(value = "海康标识", example = "1")
			@@ -145,19 +149,23 @@
			@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;

			@ApiModelProperty(value = "ERP同步时间")
			@ExcelColumn(name="ERP同步时间")
			@JsonFormat(pattern = "yyyy-MM-dd")
			private Date erpDate;

			@ApiModelProperty(value = "ERP同步状态 0未同步 1已同步", example = "1")
			@@ -170,7 +178,6 @@

			@ApiModelProperty(value = "钉钉同步时间")
			@ExcelColumn(name="钉钉同步时间")
			@JsonFormat(pattern = "yyyy-MM-dd")
			private Date ddDate;

			@ApiModelProperty(value = "钉钉P同步状态 0未同步 1已同步", example = "1")
			@@ -195,7 +202,6 @@

			@ApiModelProperty(value = "门禁角色授权时间")
			@ExcelColumn(name="门禁角色授权时间")
			@JsonFormat(pattern = "yyyy-MM-dd")
			private Date roleDate;

			@ApiModelProperty(value = "ERP组织编码")
			@@ -209,47 +215,85 @@
			@ApiModelProperty(value = "组织名称")
			@TableField(exist = false)
			private String companyName;
			@ApiModelProperty(value = "最后操作人")
			@TableField(exist = false)
			private String editorName;
			@ApiModelProperty(value = "组织类型 0劳务公司 1内部组织")
			@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;
			@ApiModelProperty(value = "角色编码查询")
			@TableField(exist = false)
			private String roleIdParam;

			@ApiModelProperty(value = "前缀地址")
			@TableField(exist = false)
			private String prefixUrl;

			@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)
			private Integer isFace;

			@ApiModelProperty(value = "访问次数")
			@TableField(exist = false)
			private Integer visitTimes;

			@ApiModelProperty(value = "最后访问时间")
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
			private Date lastVisitDate;

			@ApiModelProperty(value = "门禁有效期开始")
			@ExcelColumn(name="门禁有效期开始",index= 5,dateFormat = "yyyy-MM-dd")
			private Date startTime;
			@ApiModelProperty(value = "编码集合")
			@TableField(exist = false)
			private List<Integer> idList;

			@ApiModelProperty(value = "门禁有效期结束", example = "1")
			@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 String optRemark;
			@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;

			}