From 4e45a8252d7bccd23a1a57aa541a2ea521760572 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期一, 21 十月 2024 15:39:04 +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 | 91 +++++++++++----------------------------------
1 files changed, 22 insertions(+), 69 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 bcfb1f3..abd060e 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
@@ -26,268 +26,213 @@
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
- @ExcelColumn(name="涓婚敭")
private Integer id;
@ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
- @ExcelColumn(name="鍒涘缓浜虹紪鐮�")
private Integer creator;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @ExcelColumn(name="鍒涘缓鏃堕棿")
+ @ExcelColumn(name="鍒涘缓鏃堕棿",index = 7, dateFormat = "yyyy-MM-dd hh:mm:ss")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
- @ExcelColumn(name="鏇存柊浜虹紪鐮�")
private Integer editor;
@ApiModelProperty(value = "鏇存柊鏃堕棿")
- @ExcelColumn(name="鏇存柊鏃堕棿")
-
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
- @ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
private Integer isdeleted;
@ApiModelProperty(value = "鍚嶇О")
- @ExcelColumn(name="鍚嶇О")
private String name;
@ApiModelProperty(value = "澶囨敞")
- @ExcelColumn(name="澶囨敞")
private String remark;
@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锛�")
+ @ExcelColumn(name="鐘舵��",index = 8, valueMapping = "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="鎺掑簭鐮�")
private Integer sortnum;
@ApiModelProperty(value = "浣滀笟鍗曞彿")
- @ExcelColumn(name="浣滀笟鍗曞彿")
private String code;
@ApiModelProperty(value = "浣滀笟鍞竴鏍囪瘑(鎵胯繍鍗曞彿锛�")
- @ExcelColumn(name="浣滀笟鍞竴鏍囪瘑(鎵胯繍鍗曞彿锛�")
+ @ExcelColumn(name="杩愬崟鍙�",index = 0)
private String billCode;
@ApiModelProperty(value = "鍙告満缂栫爜", example = "1")
- @ExcelColumn(name="鍙告満缂栫爜")
private Integer driverId;
@ApiModelProperty(value = "鍙告満濮撳悕")
- @ExcelColumn(name="鍙告満濮撳悕")
+ @ExcelColumn(name="鍙告満濮撳悕",index = 4)
private String driverName;
@ApiModelProperty(value = "杞︾墝鍙�")
- @ExcelColumn(name="杞︾墝鍙�")
private String plateNum;
@ApiModelProperty(value = "鍙告満鎵嬫満鍙�")
- @ExcelColumn(name="鍙告満鎵嬫満鍙�")
+ @ExcelColumn(name="鍙告満鐢佃瘽",index = 5)
private String drivierPhone;
@ApiModelProperty(value = "绛惧埌鏃堕棿")
- @ExcelColumn(name="绛惧埌鏃堕棿")
private Date signDate;
@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 = "浣滀笟鏈堝彴鍚嶇О闆嗗悎锛屽涓娇鐢ㄨ嫳鏂囬�楀彿闅斿紑")
- @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="鍙彿鏃堕棿")
private Date callDate;
-
@ApiModelProperty(value = "鍙彿浜虹紪鐮�", example = "1")
- @ExcelColumn(name="鍙彿浜虹紪鐮�")
private Integer callUserId;
@ApiModelProperty(value = "鍙彿澶囨敞")
- @ExcelColumn(name="鍙彿澶囨敞")
private String callInfo;
@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")
- @ExcelColumn(name="寮傚父鎸傝捣浜虹紪鐮�")
private Integer errorUserId;
@ApiModelProperty(value = "寮傚父鎸傝捣澶囨敞")
- @ExcelColumn(name="寮傚父鎸傝捣澶囨敞")
private String errorInfo;
@ApiModelProperty(value = "鏈堝彴杞氦鏃堕棿")
- @ExcelColumn(name="鏈堝彴杞氦鏃堕棿")
private Date transPlatformDate;
@ApiModelProperty(value = "鏈堝彴杞氦澶勭悊浜�", example = "1")
- @ExcelColumn(name="鏈堝彴杞氦澶勭悊浜�")
private Integer transPlatformUserId;
@ApiModelProperty(value = "鏈堝彴杞氦澶囨敞")
- @ExcelColumn(name="鏈堝彴杞氦澶囨敞")
private String transPlatformInfo;
@ApiModelProperty(value = "杞﹁締杩涘巶鏃堕棿")
- @ExcelColumn(name="杞﹁締杩涘巶鏃堕棿")
private Date inDate;
@ApiModelProperty(value = "杞﹁締绂诲巶鏃堕棿")
- @ExcelColumn(name="杞﹁締绂诲巶鏃堕棿")
private Date outDate;
@ApiModelProperty(value = "绂诲巶鏂瑰紡 0鑷姩绂诲巶 1鎵嬪姩绂诲満", example = "1")
- @ExcelColumn(name="绂诲巶鏂瑰紡 0鑷姩绂诲巶 1鎵嬪姩绂诲満")
private Integer outType;
@ApiModelProperty(value = "杞﹁締绂诲巶涓嬪彂鐘舵�� 0寰呬笅鍙� 1涓嬪彂涓� 2涓嬪彂鎴愬姛 3涓嬪彂澶辫触", example = "1")
- @ExcelColumn(name="杞﹁締绂诲巶涓嬪彂鐘舵�� 0寰呬笅鍙� 1涓嬪彂涓� 2涓嬪彂鎴愬姛 3涓嬪彂澶辫触")
private Integer outHkstatus;
@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涓嬪彂澶辫触")
private Integer inHkstatus;
@ApiModelProperty(value = "杞﹁締杩涘巶涓嬪彂澶囨敞")
- @ExcelColumn(name="杞﹁締杩涘巶涓嬪彂澶囨敞")
private String nHkinfo;
@ApiModelProperty(value = "杞﹁締杩涘巶涓嬪彂鏃堕棿")
- @ExcelColumn(name="杞﹁締杩涘巶涓嬪彂鏃堕棿")
private Date inHkdate;
@ApiModelProperty(value = "浣滀笟绫诲瀷 0鑷湁杞﹀嵏璐� 1鑷湁杞﹁璐� 2澶栧崗杞﹀嵏璐� 3澶栧崗杞﹁璐� 4甯傚叕鍙稿鍗忚溅鍗歌揣", example = "1")
- @ExcelColumn(name="浣滀笟绫诲瀷 0鑷湁杞﹀嵏璐� 1鑷湁杞﹁璐� 2澶栧崗杞﹀嵏璐� 3澶栧崗杞﹁璐� 4甯傚叕鍙稿鍗忚溅鍗歌揣")
+ @ExcelColumn(name="浣滀笟绫诲瀷",index = 6,valueMapping = "0=鑷湁杞﹀嵏璐�;1=鑷湁杞﹁璐�;2=澶栧崗杞﹀嵏璐�;3=澶栧崗杞﹁璐�;4=甯傚叕鍙稿鍗忚溅鍗歌揣")
private Integer type;
@ApiModelProperty(value = "鍓嶈溅鐗屽彿")
- @ExcelColumn(name="鍓嶈溅鐗屽彿")
+ @ExcelColumn(name="鍓嶈溅鐗屽彿",index = 2)
private String carCodeFront;
@ApiModelProperty(value = "鍚庤溅鐗屽彿")
- @ExcelColumn(name="鍚庤溅鐗屽彿")
private String carCodeBack;
@ApiModelProperty(value = "鍙告満鎵�灞為儴闂ㄧ紪鐮�", example = "1")
- @ExcelColumn(name="鍙告満鎵�灞為儴闂ㄧ紪鐮�")
private Integer companyId;
@ApiModelProperty(value = "鍙告満鎵�灞為儴闂ㄥ悕绉拌矾寰�")
- @ExcelColumn(name="鍙告満鎵�灞為儴闂ㄥ悕绉拌矾寰�")
private String companyNamePath;
@ApiModelProperty(value = "浣滃簾鏃堕棿")
- @ExcelColumn(name="浣滃簾鏃堕棿")
private Date cancelDate;
@ApiModelProperty(value = "浣滃簾澶勭悊浜虹紪鐮�", example = "1")
- @ExcelColumn(name="浣滃簾澶勭悊浜虹紪鐮�")
private Integer cancelUserId;
@ApiModelProperty(value = "浣滀负澶勭悊澶囨敞")
- @ExcelColumn(name="浣滀负澶勭悊澶囨敞")
private String cancelInfo;
@ApiModelProperty(value = "鍏ュ洯浜嬬敱")
- @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 = "鏈�鏂板彨鍙锋椂闂�")
@@ -313,6 +258,9 @@
@ApiModelProperty(value = "浣滀笟鏈堝彴鍚嶇О")
@TableField(exist = false)
private String platformName ;
+ @ApiModelProperty(value = "鏈堝彴绌洪棽鏂囨")
+ @TableField(exist = false)
+ private String ledContent ;
@ApiModelProperty(value = "鏄惁瓒呮椂锛�0=鏄紱1=鍚�", example = "1")
@TableField(exist = false)
@@ -340,6 +288,7 @@
private Integer groupType ;
@ApiModelProperty(value = "鎵胯繍鍟�")
+ @ExcelColumn(name="杩愯緭鍏徃",index = 3)
@TableField(exist = false)
private String carrierName ;
@@ -428,6 +377,10 @@
@TableField(exist = false)
private String queryStatusForPower;
+ @ApiModelProperty(value = "浠诲姟鏉ユ簮")
+ @ExcelColumn(name="浠诲姟鏉ユ簮",index = 1,valueMapping = "0=WMS鑾峰彇;1=鑷富棰勭害;")
+ @TableField(exist = false)
+ private Integer jobForm;
@ApiModelProperty(value = "浣滀笟绫诲瀷鏌ヨ 澶氫釜浠�,鍒嗗壊")
@TableField(exist = false)
--
Gitblit v1.9.3