From ade1b378ff2f0781be2fbc537b6c09237a50631a Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期二, 20 八月 2024 18:18:59 +0800 Subject: [PATCH] 代码初始化 --- server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java | 34 ++++++++++++++++++++++++++++++++-- 1 files changed, 32 insertions(+), 2 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java index 7859656..57cfc6d 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.doumee.core.annotation.excel.ExcelColumn; +import com.doumee.core.utils.Constants; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import com.baomidou.mybatisplus.annotation.IdType; @@ -11,6 +12,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import java.util.Date; import java.math.BigDecimal; +import java.util.Objects; /** * 鏈堝彴璋冨害浣滀笟淇℃伅琛� @@ -91,7 +93,6 @@ @ApiModelProperty(value = "绛惧埌鏃堕棿") @ExcelColumn(name="绛惧埌鏃堕棿") - private Date signDate; @ApiModelProperty(value = "绛惧埌鏂瑰紡 0app绛惧埌 1鎵爜绛惧埌", example = "1") @@ -161,7 +162,6 @@ @ApiModelProperty(value = "鏈堝彴杞氦鏃堕棿") @ExcelColumn(name="鏈堝彴杞氦鏃堕棿") - private Date transPlatformDate; @ApiModelProperty(value = "鏈堝彴杞氦澶勭悊浜�", example = "1") @@ -278,4 +278,34 @@ @TableField(exist = false) private BigDecimal getDistance; + + @ApiModelProperty(value = "涓氬姟瑙﹀彂鏃堕棿 鏃堕棿") + @TableField(exist = false) + private Long optTime; + + @ApiModelProperty(value = "宸蹭綔涓氭椂闂�") + @TableField(exist = false) + private Long workTime; + + @ApiModelProperty(value = "WMS浠诲姟淇℃伅") + @TableField(exist = false) + private PlatformWmsJob platformWmsJob; + + public void dealTime(){ + if(Constants.equalsInteger(this.getStatus(),Constants.PlatformJobStatus.WAIT_CONFIRM.getKey()) + || Constants.equalsInteger(this.getStatus(),Constants.PlatformJobStatus.WART_SIGN_IN.getKey()) + ){ + return; + } + if(Constants.equalsInteger(this.getStatus(),Constants.PlatformJobStatus.WAIT_CALL.getKey())){ + this.setOptTime(this.getSignDate().getTime()); + }else if(Constants.equalsInteger(this.getStatus(),Constants.PlatformJobStatus.IN_WAIT.getKey())){ + this.setOptTime(this.getInwaitDate().getTime()); + }else if(Constants.equalsInteger(this.getStatus(),Constants.PlatformJobStatus.CALLED.getKey())){ + this.setOptTime(this.getCallDate().getTime()); + }else if(Constants.equalsInteger(this.getStatus(),Constants.PlatformJobStatus.WORKING.getKey())){ + this.setOptTime(this.getStartDate().getTime()); + } + } + } -- Gitblit v1.9.3