From d6aa8bb0f1915f7d4908cdac92c4483c8711647b Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 30 八月 2024 18:08:57 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java | 75 +++++++++++++++++++++++++++++++++----
1 files changed, 67 insertions(+), 8 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 e2cd5a2..cce09ae 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")
@@ -113,6 +114,9 @@
@ApiModelProperty(value = "鏈�杩戝垎閰嶆湀鍙扮紪鐮侊紙鍏宠仈platform)", example = "1")
@ExcelColumn(name="鏈�杩戝垎閰嶆湀鍙扮紪鐮侊紙鍏宠仈platform)")
private Integer platformId;
+ @ApiModelProperty(value = "鏈堝彴鍒嗙粍缂栫爜锛堝叧鑱攑latform_group)", example = "1")
+ @ExcelColumn(name="鏈堝彴鍒嗙粍缂栫爜锛堝叧鑱攑latform_group)")
+ private Integer platformGroupId;
@ApiModelProperty(value = "閫氱煡鍏ュ洯绛夊緟鏃堕棿")
@ExcelColumn(name="閫氱煡鍏ュ洯绛夊緟鏃堕棿")
@@ -138,17 +142,14 @@
@ApiModelProperty(value = "寮�濮嬩綔涓氭椂闂�")
@ExcelColumn(name="寮�濮嬩綔涓氭椂闂�")
-
private Date startDate;
@ApiModelProperty(value = "浣滀笟瀹屾垚鏃堕棿锛堟渶缁堟椂闂达級")
@ExcelColumn(name="浣滀笟瀹屾垚鏃堕棿锛堟渶缁堟椂闂达級")
-
private Date doneDate;
@ApiModelProperty(value = "寮傚父鎸傝捣鏃堕棿")
@ExcelColumn(name="寮傚父鎸傝捣鏃堕棿")
-
private Date errorDate;
@ApiModelProperty(value = "寮傚父鎸傝捣浜虹紪鐮�", example = "1")
@@ -161,7 +162,6 @@
@ApiModelProperty(value = "鏈堝彴杞氦鏃堕棿")
@ExcelColumn(name="鏈堝彴杞氦鏃堕棿")
-
private Date transPlatformDate;
@ApiModelProperty(value = "鏈堝彴杞氦澶勭悊浜�", example = "1")
@@ -208,7 +208,6 @@
@ApiModelProperty(value = "杞﹁締杩涘巶涓嬪彂鏃堕棿")
@ExcelColumn(name="杞﹁締杩涘巶涓嬪彂鏃堕棿")
-
private Date inHkdate;
@ApiModelProperty(value = "浣滀笟绫诲瀷 0鑷湁杞﹀嵏璐� 1鑷湁杞﹁璐� 2澶栧崗杞﹀嵏璐� 3澶栧崗杞﹁璐� 4甯傚叕鍙稿鍗忚溅鍗歌揣", example = "1")
@@ -233,7 +232,6 @@
@ApiModelProperty(value = "浣滃簾鏃堕棿")
@ExcelColumn(name="浣滃簾鏃堕棿")
-
private Date cancelDate;
@ApiModelProperty(value = "浣滃簾澶勭悊浜虹紪鐮�", example = "1")
@@ -266,14 +264,75 @@
@ApiModelProperty(value = "鍓嶆柟鎺掗槦鏁伴噺", example = "1")
@TableField(exist = false)
- private Long lineUpNum;
+ private Integer lineUpNum;
+
+ @ApiModelProperty(value = "棰勮绛夊緟鏃堕棿", example = "1")
+ @TableField(exist = false)
+ private String waitTime;
+
+ @ApiModelProperty(value = "棰勮瀹屾垚鏃堕棿", example = "1")
+ @TableField(exist = false)
+ private String finishTimeStr;
@ApiModelProperty(value = "浣滀笟鏈堝彴鍚嶇О")
@TableField(exist = false)
private String platformName ;
+ @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)
+ private Long optTime;
+
+ @ApiModelProperty(value = "宸蹭綔涓氭椂闂�")
+ @TableField(exist = false)
+ private Long workTime;
+
+ @ApiModelProperty(value = "WMS浠诲姟淇℃伅")
+ @TableField(exist = false)
+ private PlatformWmsJob platformWmsJob;
+
+ @ApiModelProperty(value = "鏀惰揣鍦帮紙鐩殑鍦帮級")
+ @TableField(exist = false)
+ private String repertotyAddress;
+
+ @ApiModelProperty(value = "鍙彿绫诲瀷锛�1=鍙彿鍏ュ洯 锛� 2=鏈堝彴鍙彿 锛� 3=鎺掗槦鎯呭喌", example = "1")
+ @TableField(exist = false)
+ private Integer callType;
+
+ 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