productDev/dmvisit.git

			@@ -2,7 +2,9 @@

			import com.baomidou.mybatisplus.annotation.TableField;
			import com.doumee.core.annotation.excel.ExcelColumn;
			import com.doumee.core.model.LoginUserModel;
			import com.doumee.service.business.third.model.LoginUserInfo;
			import com.doumee.service.business.third.model.LoginUserModel;
			import com.doumee.dao.business.vo.ApproveDataVO;
			import io.swagger.annotations.ApiModel;
			import io.swagger.annotations.ApiModelProperty;
			import com.baomidou.mybatisplus.annotation.IdType;
			@@ -78,7 +80,6 @@
			private String name;
			@ApiModelProperty(value = "访客年龄")
			@ExcelColumn(name="访客年龄")
			@JsonFormat(pattern = "yyyy-MM-dd")
			private Date birthday;
			@ApiModelProperty(value = "手机号")
			@ExcelColumn(name="手机号")
			@@ -144,8 +145,8 @@
			@ExcelColumn(name="接待人员")
			private Integer receptMemberId;

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

			@ApiModelProperty(value = "初审人编码", example = "1")
			@@ -154,7 +155,6 @@

			@ApiModelProperty(value = "初审时间")
			@ExcelColumn(name="初审时间")
			@JsonFormat(pattern = "yyyy-MM-dd")
			private Date checkDate;

			@ApiModelProperty(value = "初审备注")
			@@ -167,7 +167,6 @@

			@ApiModelProperty(value = "终审时间")
			@ExcelColumn(name="终审时间")
			@JsonFormat(pattern = "yyyy-MM-dd")
			private Date endCheckDate;

			@ApiModelProperty(value = "终审备注")
			@@ -194,9 +193,12 @@
			@ExcelColumn(name="答题记录编码（关联user_answer)")
			private Integer userAnswerId;

			@ApiModelProperty(value = "海康标识")
			@ExcelColumn(name="海康标识")
			@ApiModelProperty(value = "海康访客标识")
			@ExcelColumn(name="海康访客标识")
			private String hkId;
			@ApiModelProperty(value = "海康预约标识")
			@ExcelColumn(name="海康预约标识")
			private String hkRecordId;
			@ApiModelProperty(value = "openid")
			@ExcelColumn(name="openid")
			private String openid;
			@@ -215,12 +217,14 @@

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

			@ApiModelProperty(value = "ERP申请记录编码")
			@ExcelColumn(name="ERP申请记录编码")
			private String erpId;

			@ApiModelProperty(value = "是否发送超时通知 0：未发送；1=已发送")
			private Integer sendTimeOutNotice;


			@ApiModelProperty(value = "统计数量 ")
			@@ -238,13 +242,18 @@
			@ExcelColumn(name="施工事由")
			private String constructionReason;

			@ApiModelProperty(value = "钉钉待办任务主键")
			private String ddToDoId;

			@ApiModelProperty(value = "钉钉待办任务归属人主键")
			private String ddBelongToUnionId;
			@ApiModelProperty(value = "普通访客申请随访人员")
			@TableField(exist = false)
			private List<Visits> withUserList;
			// @ApiModelProperty(value = "班次")
			// private String memberClasses;

			@ApiModelProperty(value = "类型 0劳务访客 1普通访客 2内部人员", example = "1")
			@ApiModelProperty(value = "类型 0劳务访客 1普通访客 2内部人员", example = "1")
			@TableField(exist = false)
			private Integer memberType;
			@ApiModelProperty(value = "劳务访客申请随访人员")
			@@ -261,6 +270,11 @@
			@ExcelColumn(name="被访人员姓名")
			@TableField(exist = false)
			private String receptMemberName;

			@ApiModelProperty(value = "被访人员电话", example = "1")
			@ExcelColumn(name="被访人员电话")
			@TableField(exist = false)
			private String receptMemberMobile;
			@ApiModelProperty(value = "被访人员海康编码", example = "1")
			@ExcelColumn(name="被访人员姓名")
			@TableField(exist = false)
			@@ -296,4 +310,45 @@
			@ApiModelProperty(value = "离场状态；0=未离场", example = "1",hidden = true)
			@TableField(exist = false)
			private Integer levelStatus;

			@ApiModelProperty(value = "业务审核状态 0待审核 1审批中 2审核通过 3审核不通过 4取消 ", example = "1")
			@TableField(exist = false)
			private Integer businessStatus;


			@ApiModelProperty(value = "创建人姓名", example = "1")
			@TableField(exist = false)
			private String createMemberName;

			@ApiModelProperty(value = "创建人电话", example = "1")
			@TableField(exist = false)
			private String createMobile;

			@ApiModelProperty(value = "后端创建人", example = "1",hidden = true)
			@TableField(exist = false)
			private LoginUserInfo loginUserInfo;

			@ApiModelProperty(value = "通知描述")
			@TableField(exist = false)
			private String info;
			@ApiModelProperty(value = "当前是否在园")
			@TableField(exist = false)
			private Integer retentionNum;

			@ApiModelProperty(value = "审批信息数据")
			@TableField(exist = false)
			private ApproveDataVO approveDateVO;


			@ApiModelProperty(value = "查询时间开始日期格式：yyyy-MM-dd")
			@JsonFormat(pattern = "yyyy-MM-dd")
			@TableField(exist = false)
			private Date queryStarttime;

			@ApiModelProperty(value = "查询时间结束日期格式：yyyy-MM-dd")
			@JsonFormat(pattern = "yyyy-MM-dd")
			@TableField(exist = false)
			private Date queryEndtime;


			}