From 17efddc6a667670dca682bf36b51a43e99615e6d Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 16 十月 2024 15:59:38 +0800
Subject: [PATCH] 代码初始化

---
 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java |  311 +++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 259 insertions(+), 52 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 087be1d..bcfb1f3 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
@@ -1,6 +1,8 @@
 package com.doumee.dao.business.model;
 
+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;
@@ -10,11 +12,12 @@
 import com.fasterxml.jackson.annotation.JsonFormat;
 import java.util.Date;
 import java.math.BigDecimal;
+import java.util.Objects;
 
 /**
  * 鏈堝彴璋冨害浣滀笟淇℃伅琛�
  * @author 姹熻箘韫�
- * @since 2024/04/28 16:06
+ * @date 2024/06/28 10:03
  */
 @Data
 @ApiModel("鏈堝彴璋冨害浣滀笟淇℃伅琛�")
@@ -32,7 +35,6 @@
 
     @ApiModelProperty(value = "鍒涘缓鏃堕棿")
     @ExcelColumn(name="鍒涘缓鏃堕棿")
-    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date createDate;
 
     @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -41,7 +43,7 @@
 
     @ApiModelProperty(value = "鏇存柊鏃堕棿")
     @ExcelColumn(name="鏇存柊鏃堕棿")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+  
     private Date editDate;
 
     @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -56,9 +58,12 @@
     @ExcelColumn(name="澶囨敞")
     private String remark;
 
-    @ApiModelProperty(value = "鐘舵�� 0寰呯‘璁� 1寰呯鍒� 2绛夊緟鍙彿 3鍙彿涓� 4浣滀笟涓� 5浣滀笟瀹屾垚 6寮傚父鎸傝捣 7鏈堝彴绛夊緟 8宸蹭綔搴�", example = "1")
-    @ExcelColumn(name="鐘舵�� 0寰呯‘璁� 1寰呯鍒� 2绛夊緟鍙彿 3鍙彿涓� 4浣滀笟涓� 5浣滀笟瀹屾垚 6寮傚父鎸傝捣 7鏈堝彴绛夊緟 8宸蹭綔搴�")
+    @ApiModelProperty(value = "鐘舵�� 0寰呯‘璁� 1寰呯鍒� 2绛夊緟鍙彿 3鍏ュ洯绛夊緟 4宸插彨鍙� 5浣滀笟涓� 6浣滀笟瀹屾垚 7杞Щ涓� 8寮傚父鎸傝捣 9宸叉巿鏉冪鍥� 10宸茬鍥� 11 宸茶繃鍙�  12鍙栨秷锛圵MS锛�" , example = "1")
+    @ExcelColumn(name="鐘舵�� 0寰呯‘璁� 1寰呯鍒� 2绛夊緟鍙彿 3鍏ュ洯绛夊緟 4宸插彨鍙� 5浣滀笟涓� 6浣滀笟瀹屾垚 7杞Щ涓� 8寮傚父鎸傝捣 9宸叉巿鏉冪鍥� 10宸茬鍥� 11 宸茶繃鍙�  12鍙栨秷锛圵MS锛�")
     private Integer status;
+    @ApiModelProperty(value = "杞﹁締杩涘叆鐘舵�� 0涓嶅湪 1杩涘叆 " , example = "1")
+    @ExcelColumn(name="杞﹁締杩涘叆鐘舵�� 0涓嶅湪 1杩涘叆 ")
+    private Integer inOut;
 
     @ApiModelProperty(value = "鎺掑簭鐮�", example = "1")
     @ExcelColumn(name="鎺掑簭鐮�")
@@ -66,70 +71,82 @@
 
     @ApiModelProperty(value = "浣滀笟鍗曞彿")
     @ExcelColumn(name="浣滀笟鍗曞彿")
-    private String startTime;
+    private String code;
 
-    @ApiModelProperty(value = "浣滀笟鍞竴鏍囪瘑")
-    @ExcelColumn(name="浣滀笟鍞竴鏍囪瘑")
-    private String endTime;
+    @ApiModelProperty(value = "浣滀笟鍞竴鏍囪瘑(鎵胯繍鍗曞彿锛�")
+    @ExcelColumn(name="浣滀笟鍞竴鏍囪瘑(鎵胯繍鍗曞彿锛�")
+    private String billCode;
 
     @ApiModelProperty(value = "鍙告満缂栫爜", example = "1")
     @ExcelColumn(name="鍙告満缂栫爜")
-    private Integer deviceIds;
+    private Integer driverId;
 
     @ApiModelProperty(value = "鍙告満濮撳悕")
     @ExcelColumn(name="鍙告満濮撳悕")
-    private String screenIds;
+    private String driverName;
+
+    @ApiModelProperty(value = "杞︾墝鍙�")
+    @ExcelColumn(name="杞︾墝鍙�")
+    private String plateNum;
 
     @ApiModelProperty(value = "鍙告満鎵嬫満鍙�")
     @ExcelColumn(name="鍙告満鎵嬫満鍙�")
-    private String workingNum;
-
-    @ApiModelProperty(value = "骞挎挱鎻愰啋娆℃暟", example = "1")
-    @ExcelColumn(name="骞挎挱鎻愰啋娆℃暟")
-    private Integer broadcastNum;
-
-    @ApiModelProperty(value = "骞挎挱璁惧缂栫爜")
-    @ExcelColumn(name="骞挎挱璁惧缂栫爜")
-    private String broadcastIds;
-
-    @ApiModelProperty(value = "骞挎挱鎻愰啋鍐呭")
-    @ExcelColumn(name="骞挎挱鎻愰啋鍐呭")
-    private String broadcastInfo;
-
-    @ApiModelProperty(value = "骞挎挱鎻愰啋涓嬪彂鐘舵�� 0寰呬笅鍙� 1涓嬪彂涓� 2涓嬪彂鎴愬姛 3涓嬪彂澶辫触", example = "1")
-    @ExcelColumn(name="骞挎挱鎻愰啋涓嬪彂鐘舵�� 0寰呬笅鍙� 1涓嬪彂涓� 2涓嬪彂鎴愬姛 3涓嬪彂澶辫触")
-    private Integer broadcastHkstatus;
-
-    @ApiModelProperty(value = "骞挎挱鎻愰啋涓嬪彂鏃堕棿")
-    @ExcelColumn(name="骞挎挱鎻愰啋涓嬪彂鏃堕棿")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date broadcastHkdate;
-
-    @ApiModelProperty(value = "骞挎挱鎻愰啋涓嬪彂澶囨敞")
-    @ExcelColumn(name="骞挎挱鎻愰啋涓嬪彂澶囨敞")
-    private String broadcastHkinfo;
+    private String drivierPhone;
 
     @ApiModelProperty(value = "绛惧埌鏃堕棿")
     @ExcelColumn(name="绛惧埌鏃堕棿")
-    @JsonFormat(pattern = "yyyy-MM-dd")
     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="绛惧埌璺濈(绫筹級")
     private BigDecimal signDistance;
 
-    @ApiModelProperty(value = "鍒嗛厤鏈堝彴缂栫爜锛堝叧鑱攑latform)", example = "1")
-    @ExcelColumn(name="鍒嗛厤鏈堝彴缂栫爜锛堝叧鑱攑latform)")
+    @ApiModelProperty(value = "浣滀笟鏈堝彴鍚嶇О闆嗗悎锛屽涓娇鐢ㄨ嫳鏂囬�楀彿闅斿紑")
+    @ExcelColumn(name="浣滀笟鏈堝彴鍚嶇О闆嗗悎锛屽涓娇鐢ㄨ嫳鏂囬�楀彿闅斿紑")
+    private String platformNames;
+
+    @ApiModelProperty(value = "浣滀笟鏈堝彴缂栫爜闆嗗悎锛屽涓娇鐢ㄨ嫳鏂囬�楀彿闅斿紑")
+    @ExcelColumn(name="浣滀笟鏈堝彴缂栫爜闆嗗悎锛屽涓娇鐢ㄨ嫳鏂囬�楀彿闅斿紑")
+    private String platforms;
+
+    @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="閫氱煡鍏ュ洯绛夊緟鏃堕棿")
+    private Date inwaitDate;
+
+    @ApiModelProperty(value = "閫氱煡鍏ュ洯绛夊緟鎿嶄綔浜虹紪鐮�", example = "1")
+    @ExcelColumn(name="閫氱煡鍏ュ洯绛夊緟鎿嶄綔浜虹紪鐮�")
+    private Integer inwaitUserId;
 
     @ApiModelProperty(value = "鍙彿鏃堕棿")
     @ExcelColumn(name="鍙彿鏃堕棿")
-    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date callDate;
+
 
     @ApiModelProperty(value = "鍙彿浜虹紪鐮�", example = "1")
     @ExcelColumn(name="鍙彿浜虹紪鐮�")
@@ -141,17 +158,14 @@
 
     @ApiModelProperty(value = "寮�濮嬩綔涓氭椂闂�")
     @ExcelColumn(name="寮�濮嬩綔涓氭椂闂�")
-    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date startDate;
 
     @ApiModelProperty(value = "浣滀笟瀹屾垚鏃堕棿锛堟渶缁堟椂闂达級")
     @ExcelColumn(name="浣滀笟瀹屾垚鏃堕棿锛堟渶缁堟椂闂达級")
-    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date doneDate;
 
     @ApiModelProperty(value = "寮傚父鎸傝捣鏃堕棿")
     @ExcelColumn(name="寮傚父鎸傝捣鏃堕棿")
-    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date errorDate;
 
     @ApiModelProperty(value = "寮傚父鎸傝捣浜虹紪鐮�", example = "1")
@@ -164,7 +178,6 @@
 
     @ApiModelProperty(value = "鏈堝彴杞氦鏃堕棿")
     @ExcelColumn(name="鏈堝彴杞氦鏃堕棿")
-    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date transPlatformDate;
 
     @ApiModelProperty(value = "鏈堝彴杞氦澶勭悊浜�", example = "1")
@@ -177,12 +190,10 @@
 
     @ApiModelProperty(value = "杞﹁締杩涘巶鏃堕棿")
     @ExcelColumn(name="杞﹁締杩涘巶鏃堕棿")
-    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date inDate;
 
     @ApiModelProperty(value = "杞﹁締绂诲巶鏃堕棿")
     @ExcelColumn(name="杞﹁締绂诲巶鏃堕棿")
-    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date outDate;
 
     @ApiModelProperty(value = "绂诲巶鏂瑰紡 0鑷姩绂诲巶 1鎵嬪姩绂诲満", example = "1")
@@ -195,12 +206,17 @@
 
     @ApiModelProperty(value = "杞﹁締绂诲巶涓嬪彂鏃堕棿")
     @ExcelColumn(name="杞﹁締绂诲巶涓嬪彂鏃堕棿")
-    @JsonFormat(pattern = "yyyy-MM-dd")
     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涓嬪彂澶辫触")
@@ -212,7 +228,6 @@
 
     @ApiModelProperty(value = "杞﹁締杩涘巶涓嬪彂鏃堕棿")
     @ExcelColumn(name="杞﹁締杩涘巶涓嬪彂鏃堕棿")
-    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date inHkdate;
 
     @ApiModelProperty(value = "浣滀笟绫诲瀷 0鑷湁杞﹀嵏璐� 1鑷湁杞﹁璐� 2澶栧崗杞﹀嵏璐� 3澶栧崗杞﹁璐� 4甯傚叕鍙稿鍗忚溅鍗歌揣", example = "1")
@@ -237,7 +252,6 @@
 
     @ApiModelProperty(value = "浣滃簾鏃堕棿")
     @ExcelColumn(name="浣滃簾鏃堕棿")
-    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date cancelDate;
 
     @ApiModelProperty(value = "浣滃簾澶勭悊浜虹紪鐮�", example = "1")
@@ -252,4 +266,197 @@
     @ExcelColumn(name="鍏ュ洯浜嬬敱")
     private String reason;
 
+    @ApiModelProperty(value = "鍚堝悓鍙�")
+    @ExcelColumn(name="鍚堝悓鍙�")
+    private String contractNum;
+
+    @ApiModelProperty(value = "棰勮鍒板満鏃堕棿")
+    @ExcelColumn(name="棰勮鍒板満鏃堕棿")
+    private Date arriveDate;
+
+    @ApiModelProperty(value = "鍏ュ簱绫诲瀷 0鏁存墭鐩� 1浠剁儫", example = "1")
+    @ExcelColumn(name="鍏ュ簱绫诲瀷 0鏁存墭鐩� 1浠剁儫")
+    private Integer inType;
+
+    @ApiModelProperty(value = "鎬昏繍杈撻噺", example = "1")
+    @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 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 = "鏄惁瓒呮椂锛�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)
+    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 = "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 = "瀹屾垚浣滀笟鏃堕棿璧�")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @TableField(exist = false)
+    private Date beginDoneDateStart;
+
+    @ApiModelProperty(value = "瀹屾垚浣滀笟鏃堕棿姝�")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @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)
+    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 queryStatusForPower;
+
+
+    @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())
+         ){
+            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