From 7298d5354963a88643a543b51b90192dc9fc934c Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 11 九月 2025 18:43:14 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java | 113 ++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 88 insertions(+), 25 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 abd060e..0acfd9a 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
@@ -32,7 +32,7 @@
private Integer creator;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @ExcelColumn(name="鍒涘缓鏃堕棿",index = 7, dateFormat = "yyyy-MM-dd hh:mm:ss")
+ @ExcelColumn(name="鍒涘缓鏃堕棿",index = 12, dateFormat = "yyyy-MM-dd hh:mm:ss",width = 10)
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -43,6 +43,8 @@
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
private Integer isdeleted;
+ @ApiModelProperty(value = "浣滀笟鏉ユ簮锛�0鑷缓 1wms鎺ㄩ��", example = "1")
+ private Integer origin;
@ApiModelProperty(value = "鍚嶇О")
private String name;
@@ -51,7 +53,7 @@
private String remark;
@ApiModelProperty(value = "鐘舵�� 0寰呯‘璁� 1寰呯鍒� 2绛夊緟鍙彿 3鍏ュ洯绛夊緟 4宸插彨鍙� 5浣滀笟涓� 6浣滀笟瀹屾垚 7杞Щ涓� 8寮傚父鎸傝捣 9宸叉巿鏉冪鍥� 10宸茬鍥� 11 宸茶繃鍙� 12鍙栨秷锛圵MS锛�" , example = "1")
- @ExcelColumn(name="鐘舵��",index = 8, valueMapping = "0:寰呯‘璁�;1:寰呯鍒�;2:绛夊緟鍙彿;3:鍏ュ洯绛夊緟;4:宸插彨鍙�;5:浣滀笟涓�;6:浣滀笟瀹屾垚;7:杞Щ涓�;8:寮傚父鎸傝捣;9:宸叉巿鏉冪鍥�;10:宸茬鍥�;11:宸茶繃鍙�;12:鍙栨秷锛圵MS锛�;")
+ @ExcelColumn(name="鐘舵��",index =13,width = 6, valueMapping = "0=寰呯‘璁�;1=寰呯鍒�;2=绛夊緟鍙彿;3=鍏ュ洯绛夊緟;4=宸插彨鍙�;5=浣滀笟涓�;6=浣滀笟瀹屾垚;7=杞Щ涓�;8=寮傚父鎸傝捣;9=宸叉巿鏉冪鍥�;10=宸茬鍥�;11=宸茶繃鍙�;12=鍙栨秷锛圵MS锛�;")
private Integer status;
@ApiModelProperty(value = "杞﹁締杩涘叆鐘舵�� 0涓嶅湪 1杩涘叆 " , example = "1")
@@ -64,24 +66,25 @@
private String code;
@ApiModelProperty(value = "浣滀笟鍞竴鏍囪瘑(鎵胯繍鍗曞彿锛�")
- @ExcelColumn(name="杩愬崟鍙�",index = 0)
+ @ExcelColumn(name="杩愬崟鍙�",index = 0,width = 5)
private String billCode;
@ApiModelProperty(value = "鍙告満缂栫爜", example = "1")
private Integer driverId;
@ApiModelProperty(value = "鍙告満濮撳悕")
- @ExcelColumn(name="鍙告満濮撳悕",index = 4)
+ @ExcelColumn(name="鍙告満濮撳悕",index = 4,width = 6)
private String driverName;
@ApiModelProperty(value = "杞︾墝鍙�")
private String plateNum;
@ApiModelProperty(value = "鍙告満鎵嬫満鍙�")
- @ExcelColumn(name="鍙告満鐢佃瘽",index = 5)
+ @ExcelColumn(name="鍙告満鐢佃瘽",index = 5,width = 8)
private String drivierPhone;
@ApiModelProperty(value = "绛惧埌鏃堕棿")
+ @ExcelColumn(name="绛惧埌鏃堕棿",index =7,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 10)
private Date signDate;
@ApiModelProperty(value = "绛惧埌鏂瑰紡 0app绛惧埌 1鎵爜绛惧埌 2鍚庡彴绛惧埌", example = "1")
@@ -106,6 +109,7 @@
private BigDecimal signDistance;
@ApiModelProperty(value = "浣滀笟鏈堝彴鍚嶇О闆嗗悎锛屽涓娇鐢ㄨ嫳鏂囬�楀彿闅斿紑")
+ @ExcelColumn(name="浣滀笟鏈堝彴鍚嶇О",index =17 ,width = 8)
private String platformNames;
@ApiModelProperty(value = "浣滀笟鏈堝彴缂栫爜闆嗗悎锛屽涓娇鐢ㄨ嫳鏂囬�楀彿闅斿紑")
@@ -124,6 +128,7 @@
private Integer inwaitUserId;
@ApiModelProperty(value = "鍙彿鏃堕棿")
+ @ExcelColumn(name="鍙彿鏃堕棿",index =8 ,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 10)
private Date callDate;
@ApiModelProperty(value = "鍙彿浜虹紪鐮�", example = "1")
@@ -133,9 +138,11 @@
private String callInfo;
@ApiModelProperty(value = "寮�濮嬩綔涓氭椂闂�")
+ @ExcelColumn(name="寮�濮嬩綔涓氭椂闂�",index =9 ,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 10)
private Date startDate;
@ApiModelProperty(value = "浣滀笟瀹屾垚鏃堕棿锛堟渶缁堟椂闂达級")
+ @ExcelColumn(name="浣滀笟瀹屾垚鏃堕棿",index =10 ,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 10)
private Date doneDate;
@ApiModelProperty(value = "寮傚父鎸傝捣鏃堕棿")
@@ -189,14 +196,15 @@
private Date inHkdate;
@ApiModelProperty(value = "浣滀笟绫诲瀷 0鑷湁杞﹀嵏璐� 1鑷湁杞﹁璐� 2澶栧崗杞﹀嵏璐� 3澶栧崗杞﹁璐� 4甯傚叕鍙稿鍗忚溅鍗歌揣", example = "1")
- @ExcelColumn(name="浣滀笟绫诲瀷",index = 6,valueMapping = "0=鑷湁杞﹀嵏璐�;1=鑷湁杞﹁璐�;2=澶栧崗杞﹀嵏璐�;3=澶栧崗杞﹁璐�;4=甯傚叕鍙稿鍗忚溅鍗歌揣")
+ @ExcelColumn(name="浣滀笟绫诲瀷",index = 15,width = 6,valueMapping = "0=鑷湁杞﹀嵏璐�;1=鑷湁杞﹁璐�;2=澶栧崗杞﹀嵏璐�;3=澶栧崗杞﹁璐�;4=甯傚叕鍙稿鍗忚溅鍗歌揣")
private Integer type;
@ApiModelProperty(value = "鍓嶈溅鐗屽彿")
- @ExcelColumn(name="鍓嶈溅鐗屽彿",index = 2)
+ @ExcelColumn(name="鍓嶈溅鐗屽彿",index = 2,width = 5)
private String carCodeFront;
@ApiModelProperty(value = "鍚庤溅鐗屽彿")
+ @ExcelColumn(name="鍚庤溅鐗屽彿",index =3 ,width = 5)
private String carCodeBack;
@ApiModelProperty(value = "鍙告満鎵�灞為儴闂ㄧ紪鐮�", example = "1")
@@ -227,13 +235,29 @@
private Integer inType;
@ApiModelProperty(value = "鎬昏繍杈撻噺", example = "1")
+ @ExcelColumn(name="鎬讳綔涓氶噺锛堜竾鏀級",index = 1,width = 5)
private BigDecimal totalNum;
@ApiModelProperty(value = "纭浠诲姟鏃堕棿")
+ @ExcelColumn(name="纭鏃堕棿",index =6 ,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 10)
private Date confirmTaskDate;
@ApiModelProperty(value = "绛惧埌搴忓彿", example = "1")
private Integer signNum;
+
+ @ApiModelProperty(value = "鏄惁鏍囪铏氭嫙鏈堝彴缁� 0鍚� 1鏄�", example = "1")
+ private Integer tagVirtual;
+ @ApiModelProperty(value = "鏍囪铏氭嫙鏈堝彴缁勬椂闂�", example = "1")
+ private Date tagVirtualTime;
+ @ApiModelProperty(value = "鏍囪铏氭嫙鏈堝彴缁勪汉鍛樼紪鐮�", example = "1")
+ private Integer tagVirtualUser;
+ @ApiModelProperty(value = "鍙彿鏂瑰紡 0鎵嬪姩鍙彿 1鑷姩鍙彿", example = "1")
+ private Integer callWay;
+ @ApiModelProperty(value = "鍔犳�ユ椂闂�", example = "1")
+ private Date urgeTime;
+ @ApiModelProperty(value = "鍔犳�ヤ汉鍛樼紪鐮�", example = "1")
+ private Integer urgeUser;
+
@ApiModelProperty(value = "鏈�鏂板彨鍙锋椂闂�")
@TableField(exist = false)
@@ -247,6 +271,11 @@
@TableField(exist = false)
private Integer lineUpNum;
+ @ApiModelProperty(value = "wms杩愯緭閲�", example = "1")
+ @TableField(exist = false)
+ private BigDecimal ioQty;
+
+
@ApiModelProperty(value = "棰勮绛夊緟鏃堕棿", example = "1")
@TableField(exist = false)
private String waitTime;
@@ -255,6 +284,10 @@
@TableField(exist = false)
private String finishTimeStr;
+ @ApiModelProperty(value = "浣滀笟鏈堝彴缂栫爜")
+ @TableField(exist = false)
+ private String platformCode;
+
@ApiModelProperty(value = "浣滀笟鏈堝彴鍚嶇О")
@TableField(exist = false)
private String platformName ;
@@ -262,22 +295,34 @@
@TableField(exist = false)
private String ledContent ;
- @ApiModelProperty(value = "鏄惁瓒呮椂锛�0=鏄紱1=鍚�", example = "1")
+ @ApiModelProperty(value = "鏄惁瓒呮椂锛�1=鏄紱0=鍚�", example = "1")
@TableField(exist = false)
private Integer isTimeOut;
@ApiModelProperty(value = "浣滀笟閲�" ,hidden = true)
@TableField(exist = false)
private BigDecimal workNum ;
+ @ApiModelProperty(value = "缁熻閲�" ,hidden = true)
+ @TableField(exist = false)
+ private Integer countum ;
+
+ @ApiModelProperty(value = "鍏ュ洯鍘熷洜涓婚敭")
+ @TableField(exist = false)
+ private Integer reasonId ;
@ApiModelProperty(value = "WMS浠诲姟鏃堕棿")
@TableField(exist = false)
+ @ExcelColumn(name="WMS鍒涘缓鏃堕棿",index =18,width = 10)
private String ioCreatedate;
-
@ApiModelProperty(value = "绂诲満涓嬪彂鎿嶄綔浜哄悕绉�", example = "1")
@TableField(exist = false)
private String outUserName;
+
+ @ApiModelProperty(value = "鏈�鍚庢搷浣滀汉鍚嶇О", example = "1")
+ @ExcelColumn(name="鏈�鍚庢搷浣滀汉鍚嶇О",index = 15,width = 12)
+ @TableField(exist = false)
+ private String editUserName;
@ApiModelProperty(value = "wms涓氬姟涓婚敭")
@TableField(exist = false)
@@ -288,9 +333,10 @@
private Integer groupType ;
@ApiModelProperty(value = "鎵胯繍鍟�")
- @ExcelColumn(name="杩愯緭鍏徃",index = 3)
+ @ExcelColumn(name="杩愯緭鍏徃",index = 16,width = 10)
@TableField(exist = false)
private String carrierName ;
+
@ApiModelProperty(value = "璺濈绛惧埌鐐硅窛绂�")
@TableField(exist = false)
@@ -307,6 +353,10 @@
@ApiModelProperty(value = "宸蹭綔涓氭椂闂�")
@TableField(exist = false)
private Long workTime;
+ @ApiModelProperty(value = "浣滀笟鏃堕暱")
+ @TableField(exist = false)
+ @ExcelColumn(name="浣滀笟鏃堕暱",index =11 ,width = 6)
+ private String workTimeStr;
@ApiModelProperty(value = "WMS浠诲姟淇℃伅")
@TableField(exist = false)
@@ -327,10 +377,24 @@
@TableField(exist = false)
private Integer jobType;
+
+
+ @ApiModelProperty(value = "鐘舵�� 0寰呯‘璁� 1寰呯鍒� 2绛夊緟鍙彿 3鍏ュ洯绛夊緟 4宸插彨鍙� 5浣滀笟涓� 6浣滀笟瀹屾垚 7杞Щ涓� 8寮傚父鎸傝捣 9宸叉巿鏉冪鍥� 10宸茬鍥� 11 宸茶繃鍙� 12鍙栨秷锛圵MS锛�", example = "1")
+ @TableField(exist = false)
+ private Integer jobStatus;
+
@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 createDateStart;
+ @ApiModelProperty(value = "寮�濮嬫椂闂存")
+ @TableField(exist = false)
+// @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date createDateEnd;
@ApiModelProperty(value = "寮�濮嬩綔涓氭椂闂存")
@JsonFormat(pattern = "yyyy-MM-dd")
@@ -347,14 +411,6 @@
@TableField(exist = false)
private Date beginDoneDateEnd;
-
- @ApiModelProperty(value = "鍒涘缓鏃堕棿璧�")
- @TableField(exist = false)
- private Date createDateStart;
-
- @ApiModelProperty(value = "鍒涘缓鏃堕棿姝�")
- @TableField(exist = false)
- private Date createDateEnd;
@ApiModelProperty(value = "鏈堝彴缁勫悕绉�")
@TableField(exist = false)
@@ -378,13 +434,16 @@
private String queryStatusForPower;
@ApiModelProperty(value = "浠诲姟鏉ユ簮")
- @ExcelColumn(name="浠诲姟鏉ユ簮",index = 1,valueMapping = "0=WMS鑾峰彇;1=鑷富棰勭害;")
+ @ExcelColumn(name="浠诲姟鏉ユ簮",index =14,valueMapping = "0=WMS鑾峰彇;1=鑷富棰勭害;")
@TableField(exist = false)
private Integer jobForm;
@ApiModelProperty(value = "浣滀笟绫诲瀷鏌ヨ 澶氫釜浠�,鍒嗗壊")
@TableField(exist = false)
private String queryType;
+ @ApiModelProperty(value = "wms鍚堝悓鍙�")
+ @TableField(exist = false)
+ private String wmsContractNum;
@ApiModelProperty(value = "鐢靛瓙閿佺姸鎬侊細0=鏈笂閿� 1=閮ㄥ垎涓婇攣 2=鍏ㄩ儴涓婇攣")
@TableField(exist = false)
@@ -395,20 +454,24 @@
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())
- ){
+ || 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());
+ if(this.getSignDate()!=null)
+ this.setOptTime(this.getSignDate().getTime());
}else if(Constants.equalsInteger(this.getStatus(),Constants.PlatformJobStatus.IN_WAIT.getKey())){
- this.setOptTime(this.getInwaitDate().getTime());
+ if(this.getInwaitDate()!=null)
+ this.setOptTime(this.getInwaitDate().getTime());
}else if(Constants.equalsInteger(this.getStatus(),Constants.PlatformJobStatus.CALLED.getKey())){
- this.setOptTime(this.getCallDate().getTime());
+ if(this.getCallDate()!=null)
+ this.setOptTime(this.getCallDate().getTime());
}else if(Constants.equalsInteger(this.getStatus(),Constants.PlatformJobStatus.WORKING.getKey())){
- this.setOptTime(this.getStartDate().getTime());
+ if(this.getStartDate()!=null)
+ this.setOptTime(this.getStartDate().getTime());
}
}
--
Gitblit v1.9.3