productDev/dmvisit.git

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

			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.LoginUserModel;
			import io.swagger.annotations.ApiModel;
			import io.swagger.annotations.ApiModelProperty;
			import com.baomidou.mybatisplus.annotation.IdType;
			@@ -54,25 +54,29 @@
			private String imgurl;

			@ApiModelProperty(value = "类型 0劳务访客 1普通访客 2内部员工 3车辆信息")
			@ExcelColumn(name="人员类型" ,index = 2, valueMapping="0=劳务访客;1=普通访客;2=内部员工;3=车辆信息;",width = 8)
			// @ExcelColumn(name="人员类型" ,index = 5, valueMapping="0=劳务访客;1=普通访客;2=内部员工;3=车辆信息;",width = 8)
			private Integer type;
			@ApiModelProperty(value = " 类型 0相关方组织 1内部人员 2访客")
			@TableField(exist = false)
			@ExcelColumn(name="人员类型" ,index = 5, valueMapping="0=劳务访客;1=普通访客;2=内部员工;3=车辆信息;",width = 8)
			private String typeName;

			@ApiModelProperty(value = "访客名称")
			@ExcelColumn(name="姓名" ,index = 3,width = 6)
			@ExcelColumn(name="姓名" ,index = 1,width = 6)
			private String name;

			@ApiModelProperty(value = "访客年龄")
			private Date birthday;

			@ApiModelProperty(value = "手机号")
			@ExcelColumn(name="手机号" ,index = 4,width = 12)
			@ExcelColumn(name="手机号" ,index = 2,width = 12)
			private String phone;

			@ApiModelProperty(value = "身份证号（MD4加密）")
			private String idcardNo;

			@ApiModelProperty(value = "证件显示信息")
			@ExcelColumn(name="身份证号" ,index = 5,width = 12)
			@ExcelColumn(name="身份证号" ,index = 3,width = 12)
			private String idcardDecode;

			@ApiModelProperty(value = "工号")
			@@ -84,7 +88,8 @@
			@ApiModelProperty(value = "海康门禁名称")
			@ExcelColumn(name="进厂门禁" ,index = 6,width = 12)
			private String deviceName;

			@ApiModelProperty(value = "车辆类型 0内部车辆 1相关方车辆 2访客车辆 3内运物流车 4外协车辆 5市公司卸货车 6未登记车辆 ")
			private Integer carType ;
			@ApiModelProperty(value = "海康门禁编码")
			private String deviceIndex;

			@@ -120,6 +125,9 @@
			@ApiModelProperty(value = "类型 0劳务公司 1内部组织")
			@TableField(exist = false)
			private Integer companyType;
			@ApiModelProperty(value = "类型 0访客 1内部人员")
			@TableField(exist = false)
			private Integer memberType;

			@ApiModelProperty(value = "开始时间")
			@TableField(exist = false)
			@@ -134,7 +142,7 @@
			private String faceImgFull;

			@ApiModelProperty(value = "导出公司名称",hidden = true)
			@ExcelColumn(name="公司/组织" ,index = 1,width = 12)
			@ExcelColumn(name="公司/组织" ,index = 4,width = 12)
			@TableField(exist = false)
			public String excelCompanyName;

			@@ -142,7 +150,6 @@
			@ApiModelProperty(value = "人数")
			@TableField(exist = false)
			private Integer num;


			@ApiModelProperty(value = "查询人员类型")
			@TableField(exist = false)