From 43942a545271345ce26e40d82bb97138c5ea7611 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 28 六月 2024 13:54:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java | 102 ++++++++++++++++++++++++++++++++-------------------
1 files changed, 64 insertions(+), 38 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 57def92..7df6ac4 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,7 +1,6 @@
package com.doumee.dao.business.model;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -15,12 +14,12 @@
/**
* 鏈堝彴璋冨害浣滀笟淇℃伅琛�
* @author 姹熻箘韫�
- * @since 2024/04/28 16:06
+ * @date 2024/06/28 10:03
*/
@Data
@ApiModel("鏈堝彴璋冨害浣滀笟淇℃伅琛�")
@TableName("`platform_job`")
-public class PlatformJob extends LoginUserModel {
+public class PlatformJob {
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
@@ -33,6 +32,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -41,6 +41,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -55,8 +56,8 @@
@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 宸茶繃鍙�", example = "1")
+ @ExcelColumn(name="鐘舵�� 0寰呯‘璁� 1寰呯鍒� 2绛夊緟鍙彿 3鍏ュ洯绛夊緟 4宸插彨鍙� 5浣滀笟涓� 6浣滀笟瀹屾垚 7杞Щ涓� 8寮傚父鎸傝捣 9宸叉巿鏉冪鍥� 10宸茬鍥� 11 宸茶繃鍙�")
private Integer status;
@ApiModelProperty(value = "鎺掑簭鐮�", example = "1")
@@ -65,50 +66,31 @@
@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="骞挎挱鎻愰啋涓嬪彂鏃堕棿")
- 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")
@@ -119,12 +101,30 @@
@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 = "閫氱煡鍏ュ洯绛夊緟鏃堕棿")
+ @ExcelColumn(name="閫氱煡鍏ュ洯绛夊緟鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ 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")
@@ -137,14 +137,17 @@
@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")
@@ -157,6 +160,7 @@
@ApiModelProperty(value = "鏈堝彴杞氦鏃堕棿")
@ExcelColumn(name="鏈堝彴杞氦鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date transPlatformDate;
@ApiModelProperty(value = "鏈堝彴杞氦澶勭悊浜�", example = "1")
@@ -169,10 +173,12 @@
@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")
@@ -185,6 +191,7 @@
@ApiModelProperty(value = "杞﹁締绂诲巶涓嬪彂鏃堕棿")
@ExcelColumn(name="杞﹁締绂诲巶涓嬪彂鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date outHkdate;
@ApiModelProperty(value = "杞﹁締绂诲巶涓嬪彂澶囨敞")
@@ -201,6 +208,7 @@
@ApiModelProperty(value = "杞﹁締杩涘巶涓嬪彂鏃堕棿")
@ExcelColumn(name="杞﹁締杩涘巶涓嬪彂鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date inHkdate;
@ApiModelProperty(value = "浣滀笟绫诲瀷 0鑷湁杞﹀嵏璐� 1鑷湁杞﹁璐� 2澶栧崗杞﹀嵏璐� 3澶栧崗杞﹁璐� 4甯傚叕鍙稿鍗忚溅鍗歌揣", example = "1")
@@ -225,6 +233,7 @@
@ApiModelProperty(value = "浣滃簾鏃堕棿")
@ExcelColumn(name="浣滃簾鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date cancelDate;
@ApiModelProperty(value = "浣滃簾澶勭悊浜虹紪鐮�", example = "1")
@@ -239,4 +248,21 @@
@ExcelColumn(name="鍏ュ洯浜嬬敱")
private String reason;
+ @ApiModelProperty(value = "鍚堝悓鍙�")
+ @ExcelColumn(name="鍚堝悓鍙�")
+ private String contractNum;
+
+ @ApiModelProperty(value = "棰勮鍒板満鏃堕棿")
+ @ExcelColumn(name="棰勮鍒板満鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ 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;
+
}
--
Gitblit v1.9.3