productDev/dmvisit.git

			@@ -9,6 +9,8 @@
			import com.baomidou.mybatisplus.annotation.TableName;
			import lombok.Data;
			import com.fasterxml.jackson.annotation.JsonFormat;
			import org.springframework.format.annotation.DateTimeFormat;

			import java.util.Date;
			import java.util.List;

			@@ -106,13 +108,34 @@
			@ExcelColumn(name="随程人员数")
			private Integer memberNum;


			@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
			@ApiModelProperty(value = "门禁有效期开始")
			@ExcelColumn(name="门禁有效期开始")
			private Date starttime;

			@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
			@ApiModelProperty(value = "门禁有效期截止")
			@ExcelColumn(name="门禁有效期截止")
			private Date endtime;
			@ApiModelProperty(value = "进厂时间")
			@ExcelColumn(name="进厂时间")
			private Date inDate;

			@ApiModelProperty(value = "离场时间")
			@ExcelColumn(name="离场时间")
			private Date outDate;
			@ApiModelProperty(value = "离场方式 0正常签离 1管理员手动签离")
			@ExcelColumn(name="离场方式 0正常签离 1管理员手动签离")
			private Integer outType;
			@ApiModelProperty(value = "强制签离管理员编码")
			@ExcelColumn(name="强制签离管理员编码")
			private Integer outUserId;
			@ApiModelProperty(value = "签离备注")
			@ExcelColumn(name="签离备注")
			private String outInfo;

			@ApiModelProperty(value = "来访事由")
			@ExcelColumn(name="来访事由")
			@@ -130,8 +153,8 @@
			@ExcelColumn(name="接待人员")
			private Integer receptMemberId;

			@ApiModelProperty(value = "审核状态 0待审核 1已提交ERP审批 2审核通过 3审核不通过 4取消", example = "1")
			@ExcelColumn(name="审核状态 0待审核 1已提交ERP审批 2审核通过 3审核不通过 4取消")
			@ApiModelProperty(value = "审核状态 0待审核 1已提交ERP审批 2审核通过 3审核不通过 4取消 5下发成功 6下发失败", example = "1")
			@ExcelColumn(name="审核状态 0待审核 1已提交ERP审批 2审核通过 3审核不通过 4取消 5下发成功 6下发失败")
			private Integer status;

			@ApiModelProperty(value = "初审人编码", example = "1")
			@@ -165,7 +188,9 @@
			@ApiModelProperty(value = "证件类型 0身份证 1港澳证件 2护照", example = "1")
			@ExcelColumn(name="证件类型 0身份证 1港澳证件 2护照")
			private Integer idcardType;

			@ApiModelProperty(value = "性别 1男 2女 ", example = "1")
			@ExcelColumn(name="性别 1男 2女")
			private Integer sex;
			@ApiModelProperty(value = "车牌号，多个用英文逗号隔开")
			@ExcelColumn(name="车牌号，多个用英文逗号隔开")
			private String carNos;
			@@ -181,8 +206,11 @@
			@ApiModelProperty(value = "海康标识")
			@ExcelColumn(name="海康标识")
			private String hkId;
			@ApiModelProperty(value = "openid")
			@ExcelColumn(name="openid")
			private String openid;

			@ApiModelProperty(value = "海康同步状态 0未同步 1已同步", example = "1")
			@ApiModelProperty(value = "海康同步状态 0未同步 1已同步 ", example = "1")
			@ExcelColumn(name="海康同步状态 0未同步 1已同步")
			private Integer hkStatus;

			@@ -194,11 +222,56 @@
			@ApiModelProperty(value = "ERP申请记录编码")
			@ExcelColumn(name="ERP申请记录编码")
			private String erpId;

			@ApiModelProperty(value = "普通访客申请随访人员")
			@TableField(exist = false)
			private List<Visits> withUserList;
			// @ApiModelProperty(value = "班次")
			// private String memberClasses;

			@ApiModelProperty(value = "类型 0劳务访客 1普通访客 2内部人员", example = "1")
			@TableField(exist = false)
			private Integer memberType;
			@ApiModelProperty(value = "劳务访客申请随访人员")
			@TableField(exist = false)
			private List<Integer> lwWithUserList;



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

			@ApiModelProperty(value = "被访人员姓名", example = "1")
			@ExcelColumn(name="被访人员姓名")
			@TableField(exist = false)
			private String receptMemberName;
			@ApiModelProperty(value = "被访人员海康编码", example = "1")
			@ExcelColumn(name="被访人员姓名")
			@TableField(exist = false)
			private String receptMemberHkId;

			@ApiModelProperty(value = "被访人员部门", example = "1")
			@ExcelColumn(name="被访人员部门")
			@TableField(exist = false)
			private String receptMemberDepartment;

			@ApiModelProperty(value = "门禁集合", example = "1")
			@ExcelColumn(name="门禁集合")
			@TableField(exist = false)
			private List<Device> deviceList;

			@ApiModelProperty(value = "随访人员列表", example = "1")
			@ExcelColumn(name="随访人员列表")
			@TableField(exist = false)
			private List<Visits> visitsList;

			@ApiModelProperty(value = "超时时长", example = "1")
			@TableField(exist = false)
			private Integer timeOut;

			@ApiModelProperty(value = "超时状态0未超时，1已超时，2即将超时", example = "1")
			@TableField(exist = false)
			private Integer outStatus;

			}