productDev/dmvisit.git

			@@ -26,109 +26,91 @@

			@TableId(type = IdType.AUTO)
			@ApiModelProperty(value = "主键", example = "1")
			@ExcelColumn(name="主键")
			private Integer id;

			@ApiModelProperty(value = "创建人编码", example = "1")
			@ExcelColumn(name="创建人编码")
			private Integer creator;

			@ApiModelProperty(value = "创建时间")
			@ExcelColumn(name="创建时间")

			private Date createDate;

			@ApiModelProperty(value = "更新人编码", example = "1")
			@ExcelColumn(name="更新人编码")
			private Integer editor;

			@ApiModelProperty(value = "更新时间")
			@ExcelColumn(name="更新时间")

			private Date editDate;

			@ApiModelProperty(value = "是否删除0否 1是", example = "1")
			@ExcelColumn(name="是否删除0否 1是")
			private Integer isdeleted;

			@ApiModelProperty(value = "名称")
			@ExcelColumn(name="名称")
			private String name;

			@ApiModelProperty(value = "备注")
			@ExcelColumn(name="备注")
			private String remark;

			@ApiModelProperty(value = "状态 0待审批 1审批中 2审批通过 3审批不通过 4已取消", example = "1")
			@ExcelColumn(name="状态 0待审批 1审批中 2审批通过 3审批不通过")
			@ExcelColumn(name="审批状态",index = 9,width = 12,valueMapping = "0=待审批;1=审批中;2=审批通过;3=审批不通过;4=已取消;")
			private Integer status;

			@ApiModelProperty(value = "合同号")
			@ExcelColumn(name="合同号")
			@ExcelColumn(name="合同号",index = 0,width = 12)
			private String contractNum;

			@ApiModelProperty(value = "预计到场时间")
			@ExcelColumn(name="预计到场时间")
			@ExcelColumn(name="预计到场时间",index = 8,width = 12,dateFormat = "yyyy-MM-dd HH:mm:ss")
			private Date arriveDate;

			@ApiModelProperty(value = "入库类型 0整托盘 1件烟", example = "1")
			@ExcelColumn(name="入库类型 0整托盘 1件烟")
			@ExcelColumn(name="入库类型",index = 7,width = 12,valueMapping = "0=整托盘;1=件烟;")
			private Integer inType;

			@ApiModelProperty(value = "总运输量", example = "1")
			@ExcelColumn(name="总运输量")
			@ExcelColumn(name="总运输量",index = 2,width = 12)
			private BigDecimal totalNum;

			@ApiModelProperty(value = "前车牌号")
			@ExcelColumn(name="前车牌号")
			@ExcelColumn(name="前车牌号",index = 3,width = 12)
			private String carCodeFront;

			@ApiModelProperty(value = "后车牌号")
			@ExcelColumn(name="后车牌号")
			@ExcelColumn(name="后车牌号",index = 4,width = 12)
			private String carCodeBack;

			@ApiModelProperty(value = "司机编码", example = "1")
			@ExcelColumn(name="司机编码")
			private Integer driverId;

			@ApiModelProperty(value = "司机姓名")
			@ExcelColumn(name="司机姓名")
			@ExcelColumn(name="司机姓名",index = 5,width = 12)
			private String driverName;

			@ApiModelProperty(value = "车牌号")
			@ExcelColumn(name="车牌号")
			private String plateNum;

			@ApiModelProperty(value = "司机手机号")
			@ExcelColumn(name="司机手机号")
			@ExcelColumn(name="司机手机号",index = 6,width = 12)
			private String driverPhone;

			@ApiModelProperty(value = "准运证照片")
			@ExcelColumn(name="准运证照片")
			private String transportImg;

			@ApiModelProperty(value = "入园原因")
			@ExcelColumn(name="入园原因")
			@ExcelColumn(name="入园原因",index = 1,width = 12)
			private String inReason;

			@ApiModelProperty(value = "入园原因主键")
			@ExcelColumn(name="入园原因主键")
			private Integer reasonId;

			@ApiModelProperty(value = "取消时间")
			@ExcelColumn(name="取消时间")
			private Date cancelTime;

			@ApiModelProperty(value = "取消人")
			@ExcelColumn(name="取消人")
			private Integer cancelUser;

			@ApiModelProperty(value = "取消备注")
			@ExcelColumn(name="取消备注")
			private String cancelInfo;

			@ApiModelProperty(value = "生成任务主键 platform_job:id")
			@ExcelColumn(name="入园原因主键")
			private Integer jobId;

			@ApiModelProperty(value = "查询日期用户微信端查询")
			@@ -148,9 +130,15 @@
			private Date arriveDateEnd;

			@ApiModelProperty(value = "审批人名称")
			@ExcelColumn(name="审批人名称",index = 10,width = 12)
			@TableField(exist = false)
			private String auditName;

			@ApiModelProperty(value = "审批时间")
			@ExcelColumn(name="审批描述",index = 11,width = 12,valueMapping = "yyyy-MM-dd HH:mm:ss")
			@TableField(exist = false)
			private String auditTime;

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