productDev/dmvisit.git

			@@ -35,7 +35,6 @@

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

			private Date createDate;

			@ApiModelProperty(value = "更新人编码", example = "1")
			@@ -59,9 +58,12 @@
			@ExcelColumn(name="备注")
			private String remark;

			@ApiModelProperty(value = "状态 0待确认 1待签到 2等待叫号 3入园等待 4已叫号 5作业中 6作业完成 7转移中 8异常挂起 9已授权离园 10已离园 11 已过号", example = "1")
			@ExcelColumn(name="状态 0待确认 1待签到 2等待叫号 3入园等待 4已叫号 5作业中 6作业完成 7转移中 8异常挂起 9已授权离园 10已离园 11 已过号")
			@ApiModelProperty(value = "状态 0待确认 1待签到 2等待叫号 3入园等待 4已叫号 5作业中 6作业完成 7转移中 8异常挂起 9已授权离园 10已离园 11 已过号 12取消（WMS）" , example = "1")
			@ExcelColumn(name="状态 0待确认 1待签到 2等待叫号 3入园等待 4已叫号 5作业中 6作业完成 7转移中 8异常挂起 9已授权离园 10已离园 11 已过号 12取消（WMS）")
			private Integer status;
			@ApiModelProperty(value = "车辆进入状态 0不在 1进入 " , example = "1")
			@ExcelColumn(name="车辆进入状态 0不在 1进入 ")
			private Integer inOut;

			@ApiModelProperty(value = "排序码", example = "1")
			@ExcelColumn(name="排序码")
			@@ -95,9 +97,24 @@
			@ExcelColumn(name="签到时间")
			private Date signDate;

			@ApiModelProperty(value = "签到方式 0app签到 1扫码签到", example = "1")
			@ExcelColumn(name="签到方式 0app签到 1扫码签到")
			@ApiModelProperty(value = "签到方式 0app签到 1扫码签到 2后台签到", example = "1")
			@ExcelColumn(name="签到方式 0app签到 1扫码签到 2后台签到")
			private Integer singType;
			@ApiModelProperty(value = "通知WMS作业绑定月台时间")
			@ExcelColumn(name="通知WMS作业绑定月台时间")
			private Date wmsSendDate;
			@ApiModelProperty(value = "通知WMS作业绑定月台状态 0待通知 1通知成功 2通知失败", example = "1")
			@ExcelColumn(name="通知WMS作业绑定月台状态 0待通知 1通知成功 2通知失败")
			private Integer wmsSendStatus;
			@ApiModelProperty(value = "通知WMS作业绑定月台編碼", example = "1")
			@ExcelColumn(name="通知WMS作业绑定月台編碼")
			private String wmsSendPlatformCode;
			@ApiModelProperty(value = "通知WMS作业绑定月台备注", example = "1")
			@ExcelColumn(name="通知WMS作业绑定月台备注")
			private String wmsSendInfo;
			@ApiModelProperty(value = "通知WMS作业绑定月台次数", example = "1")
			@ExcelColumn(name="通知WMS作业绑定月台次数")
			private Integer wmsSendNum;

			@ApiModelProperty(value = "签到距离(米）", example = "1")
			@ExcelColumn(name="签到距离(米）")
			@@ -129,8 +146,10 @@

			@ApiModelProperty(value = "叫号时间")
			@ExcelColumn(name="叫号时间")

			private Date callDate;




			@ApiModelProperty(value = "叫号人编码", example = "1")
			@ExcelColumn(name="叫号人编码")
			@@ -191,12 +210,17 @@

			@ApiModelProperty(value = "车辆离厂下发时间")
			@ExcelColumn(name="车辆离厂下发时间")

			private Date outHkdate;

			@ApiModelProperty(value = "车辆离厂下发备注")
			@ExcelColumn(name="车辆离厂下发备注")
			private String outHkinfo;


			@ApiModelProperty(value = "离场下发操作人", example = "1")
			@ExcelColumn(name="离场下发操作人")
			private Integer outUserId;


			@ApiModelProperty(value = "车辆进厂下发状态 0待下发 1下发中 2下发成功 3下发失败", example = "1")
			@ExcelColumn(name="车辆进厂下发状态 0待下发 1下发中 2下发成功 3下发失败")
			@@ -262,22 +286,74 @@
			@ExcelColumn(name="总运输量")
			private BigDecimal totalNum;

			@ApiModelProperty(value = "确认任务时间")
			@ExcelColumn(name="确认任务时间")
			private Date confirmTaskDate;

			@ApiModelProperty(value = "签到序号", example = "1")
			@ExcelColumn(name="签到序号")
			private Integer signNum;

			@ApiModelProperty(value = "最新叫号时间")
			@TableField(exist = false)
			private Date newCallDate;

			@ApiModelProperty(value = "最新开始作业时间")
			@TableField(exist = false)
			private Date newStartDate;

			@ApiModelProperty(value = "前方排队数量", example = "1")
			@TableField(exist = false)
			private Long lineUpNum;
			private Integer lineUpNum;

			@ApiModelProperty(value = "关联月台组编码（关联platform_group表）", example = "1")
			@ApiModelProperty(value = "预计等待时间", example = "1")
			@TableField(exist = false)
			private Integer groupId;
			private String waitTime;

			@ApiModelProperty(value = "预计完成时间", example = "1")
			@TableField(exist = false)
			private String finishTimeStr;

			@ApiModelProperty(value = "作业月台名称")
			@TableField(exist = false)
			private String platformName ;

			@ApiModelProperty(value = "是否超时：0=是；1=否", example = "1")
			@TableField(exist = false)
			private Integer isTimeOut;

			@ApiModelProperty(value = "作业量" ,hidden = true)
			@TableField(exist = false)
			private BigDecimal workNum ;


			@ApiModelProperty(value = "WMS任务时间")
			@TableField(exist = false)
			private String ioCreatedate;

			@ApiModelProperty(value = "离场下发操作人名称", example = "1")
			@TableField(exist = false)
			private String outUserName;

			@ApiModelProperty(value = "wms业务主键")
			@TableField(exist = false)
			private Integer wmsId ;

			@ApiModelProperty(value = "月台组类型：0安泰物流装货 1安泰物流卸货 2市公司卸货")
			@TableField(exist = false)
			private Integer groupType ;

			@ApiModelProperty(value = "承运商")
			@TableField(exist = false)
			private String carrierName ;

			@ApiModelProperty(value = "距离签到点距离")
			@TableField(exist = false)
			private BigDecimal getDistance;

			@ApiModelProperty(value = "月台作业效率（万支/小时）", hidden = true)
			@TableField(exist = false)
			private BigDecimal workRate;

			@ApiModelProperty(value = "业务触发时间时间")
			@TableField(exist = false)
			@@ -291,6 +367,69 @@
			@TableField(exist = false)
			private PlatformWmsJob platformWmsJob;

			@ApiModelProperty(value = "收货地（目的地）")
			@TableField(exist = false)
			private String repertotyAddress;
			@ApiModelProperty(value = "wms月台编号")
			@TableField(exist = false)
			private String platformWmsCode;

			@ApiModelProperty(value = "叫号类型：1=叫号入园； 2=月台叫号； 3=排队情况", example = "1")
			@TableField(exist = false)
			private Integer callType;

			@ApiModelProperty(value = "作业类型 0=安泰物流车任务；1=市公司车", example = "1")
			@TableField(exist = false)
			private Integer jobType;

			@ApiModelProperty(value = "开始作业时间起")
			@JsonFormat(pattern = "yyyy-MM-dd")
			@TableField(exist = false)
			private Date beginWorkDateStart;

			@ApiModelProperty(value = "开始作业时间止")
			@JsonFormat(pattern = "yyyy-MM-dd")
			@TableField(exist = false)
			private Date beginWorkDateEnd;


			@ApiModelProperty(value = "创建时间起")
			@TableField(exist = false)
			private Date createDateStart;

			@ApiModelProperty(value = "创建时间止")
			@TableField(exist = false)
			private Date createDateEnd;

			@ApiModelProperty(value = "月台组名称")
			@TableField(exist = false)
			private String platformGroupName ;

			@ApiModelProperty(value = "月台工作时长" ,hidden = true)
			@TableField(exist = false)
			private BigDecimal workTimes ;

			@ApiModelProperty(value = "市公司车预约记录")
			@TableField(exist = false)
			private Integer bookId;

			@ApiModelProperty(value = "多状态查询多个以,分割")
			@TableField(exist = false)
			private String queryStatus;

			@ApiModelProperty(value = "作业类型查询多个以,分割")
			@TableField(exist = false)
			private String queryType;

			@ApiModelProperty(value = "电子锁状态：0=未上锁 1=部分上锁 2=全部上锁")
			@TableField(exist = false)
			private Integer lockStatus;

			@ApiModelProperty(value = "等待叫号时间(分）")
			@TableField(exist = false)
			private Integer worktimeOutAlarmTime;


			public void dealTime(){
			if(Constants.equalsInteger(this.getStatus(),Constants.PlatformJobStatus.WAIT_CONFIRM.getKey())
			\|\| Constants.equalsInteger(this.getStatus(),Constants.PlatformJobStatus.WART_SIGN_IN.getKey())