productDev/dmvisit.git

			@@ -75,8 +75,8 @@
			@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 = "访客名称/内部人员")
			@@ -104,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="工号")
			@@ -157,6 +160,12 @@
			@ApiModelProperty(value = "在职状态 0在职 1离职", example = "1")
			@ExcelColumn(name="在职状态 0在职 1离职")
			private Integer workStatus;
			@ApiModelProperty(value = "是否党员 0否 1是", example = "1")
			@ExcelColumn(name="是否党员 0否 1是")
			private Integer isDangyuan;
			@ApiModelProperty(value = "岗位编码，关联positionbiao", example = "1")
			@ExcelColumn(name="岗位编码")
			private Integer positionId;
			@ApiModelProperty(value = "ERP标识", example = "1")
			@ExcelColumn(name="ERP标识")
			private String erpId;
			@@ -164,6 +173,10 @@
			@ApiModelProperty(value = "ERP同步时间")
			@ExcelColumn(name="ERP同步时间")
			private Date erpDate;
			@ApiModelProperty(value = "入职如期")
			@ExcelColumn(name="入职如期")
			@JsonFormat(pattern = "yyyy-MM-dd")
			private Date jobDate;

			@ApiModelProperty(value = "ERP同步状态 0未同步 1已同步", example = "1")
			@ExcelColumn(name="ERP同步状态 0未同步 1已同步")
			@@ -215,7 +228,7 @@
			@ApiModelProperty(value = "最后操作人")
			@TableField(exist = false)
			private String editorName;
			@ApiModelProperty(value = "组织类型")
			@ApiModelProperty(value = "组织类型 0劳务公司 1内部组织")
			@TableField(exist = false)
			private Integer companyType;
			@ApiModelProperty(value = "组织编码路径")
			@@ -233,11 +246,9 @@
			@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;
			@@ -247,37 +258,28 @@
			@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;
			@@ -287,17 +289,25 @@
			@ApiModelProperty(value = "是否主管 0否 1是", example = "1")
			@TableField(exist = false)
			private Integer headStatus;
			@ApiModelProperty(value = "持卡数量")
			@TableField(exist = false)
			private int memberCardCount;

			@ApiModelProperty(value = "门禁角色名称")
			@TableField(exist = false)
			private String roleName;
			@ApiModelProperty(value = "最后操作内容")
			@TableField(exist = false)
			private String optRemark;
			@ApiModelProperty(value = "岗位名称")
			@TableField(exist = false)
			private String positionName;
			@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;