From cb6aca0642ac8dd5de877ade168066d85acb589c Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 17 十月 2025 15:54:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformBooks.java | 62 ++++++++++++++++--------------
1 files changed, 33 insertions(+), 29 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformBooks.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformBooks.java
index 9b41bd6..fcee810 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformBooks.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformBooks.java
@@ -26,109 +26,93 @@
@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="鍒涘缓鏃堕棿")
-
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宸插彇娑�", example = "1")
- @ExcelColumn(name="鐘舵�� 0寰呭鎵� 1瀹℃壒涓� 2瀹℃壒閫氳繃 3瀹℃壒涓嶉�氳繃")
+ @ExcelColumn(name="瀹℃壒鐘舵��",index = 10,width = 12,valueMapping = "0=寰呭鎵�;1=瀹℃壒涓�;2=瀹℃壒閫氳繃;3=瀹℃壒涓嶉�氳繃;4=宸插彇娑�;")
private Integer status;
@ApiModelProperty(value = "鍚堝悓鍙�")
- @ExcelColumn(name="鍚堝悓鍙�")
+ @ExcelColumn(name="鍚堝悓鍙�",index = 0,width = 12)
private String contractNum;
@ApiModelProperty(value = "棰勮鍒板満鏃堕棿")
- @ExcelColumn(name="棰勮鍒板満鏃堕棿")
+ @ExcelColumn(name="棰勮鍒板満鏃堕棿",index = 9,width = 12,dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date arriveDate;
@ApiModelProperty(value = "鍏ュ簱绫诲瀷 0鏁存墭鐩� 1浠剁儫", example = "1")
- @ExcelColumn(name="鍏ュ簱绫诲瀷 0鏁存墭鐩� 1浠剁儫")
+ @ExcelColumn(name="鍏ュ簱绫诲瀷",index = 7,width = 12,valueMapping = "0=鏁存墭鐩�;1=浠剁儫;")
private Integer inType;
- @ApiModelProperty(value = "鎬昏繍杈撻噺", example = "1")
- @ExcelColumn(name="鎬昏繍杈撻噺")
+ @ApiModelProperty(value = "鎬讳綔涓氶噺(涓囨敮)", example = "1")
+ @ExcelColumn(name="鎬讳綔涓氶噺(涓囨敮)",index = 2,width = 12)
private BigDecimal totalNum;
@ApiModelProperty(value = "鍓嶈溅鐗屽彿")
- @ExcelColumn(name="鍓嶈溅鐗屽彿")
+ @ExcelColumn(name="鍓嶈溅鐗屽彿",index = 3,width = 12)
private String carCodeFront;
@ApiModelProperty(value = "鍚庤溅鐗屽彿")
- @ExcelColumn(name="鍚庤溅鐗屽彿")
+ @ExcelColumn(name="鍚庤溅鐗屽彿",index = 4,width = 12)
private String carCodeBack;
@ApiModelProperty(value = "鍙告満缂栫爜", example = "1")
- @ExcelColumn(name="鍙告満缂栫爜")
private Integer driverId;
@ApiModelProperty(value = "鍙告満濮撳悕")
- @ExcelColumn(name="鍙告満濮撳悕")
+ @ExcelColumn(name="鍙告満濮撳悕",index = 5,width = 12)
private String driverName;
@ApiModelProperty(value = "杞︾墝鍙�")
- @ExcelColumn(name="杞︾墝鍙�")
private String plateNum;
@ApiModelProperty(value = "鍙告満鎵嬫満鍙�")
- @ExcelColumn(name="鍙告満鎵嬫満鍙�")
+ @ExcelColumn(name="鍙告満鎵嬫満鍙�",index = 6,width = 12)
private String driverPhone;
@ApiModelProperty(value = "鍑嗚繍璇佺収鐗�")
- @ExcelColumn(name="鍑嗚繍璇佺収鐗�")
private String transportImg;
@ApiModelProperty(value = "鍏ュ洯鍘熷洜")
- @ExcelColumn(name="鍏ュ洯鍘熷洜")
+ @ExcelColumn(name="鍏ュ洯鍘熷洜",index = 1,width = 12)
private String inReason;
+
+
@ApiModelProperty(value = "鍏ュ洯鍘熷洜涓婚敭")
- @ExcelColumn(name="鍏ュ洯鍘熷洜涓婚敭")
private Integer reasonId;
@ApiModelProperty(value = "鍙栨秷鏃堕棿")
- @ExcelColumn(name="鍙栨秷鏃堕棿")
private Date cancelTime;
@ApiModelProperty(value = "鍙栨秷浜�")
- @ExcelColumn(name="鍙栨秷浜�")
private Integer cancelUser;
@ApiModelProperty(value = "鍙栨秷澶囨敞")
- @ExcelColumn(name="鍙栨秷澶囨敞")
private String cancelInfo;
@ApiModelProperty(value = "鐢熸垚浠诲姟涓婚敭 platform_job:id")
- @ExcelColumn(name="鍏ュ洯鍘熷洜涓婚敭")
private Integer jobId;
@ApiModelProperty(value = "鏌ヨ鏃ユ湡 鐢ㄦ埛寰俊绔煡璇�")
@@ -148,9 +132,29 @@
private Date arriveDateEnd;
@ApiModelProperty(value = "瀹℃壒浜哄悕绉�")
+ @ExcelColumn(name="瀹℃壒浜哄悕绉�",index = 11,width = 12)
@TableField(exist = false)
private String auditName;
+ @ApiModelProperty(value = "瀹℃壒鏃堕棿")
+ @ExcelColumn(name="瀹℃壒鎻忚堪",index = 12,width = 12,dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @TableField(exist = false)
+ private String auditTime;
+
+ @ApiModelProperty(value = "閫氱煡鎻忚堪")
+ @TableField(exist = false)
+ private String info;
+
+ @ApiModelProperty(value = "浣滀笟璁板綍鐘舵��: 0寰呯‘璁� 1寰呯鍒� 2绛夊緟鍙彿 3鍏ュ洯绛夊緟 4宸插彨鍙� 5浣滀笟涓� 6浣滀笟瀹屾垚 7杞Щ涓� 8寮傚父鎸傝捣 9宸叉巿鏉冪鍥� 10宸茬鍥� 11 宸茶繃鍙� 12鍙栨秷锛圵MS锛�")
+ @ExcelColumn(name="浣滀笟鐘舵��",index = 8,width = 12,valueMapping = "0=寰呯‘璁�;1=寰呯鍒�;2=绛夊緟鍙彿;3=鍏ュ洯绛夊緟;4=宸插彨鍙�;5=浣滀笟涓�;6=浣滀笟瀹屾垚;7=杞Щ涓�;8=寮傚父鎸傝捣;9=宸叉巿鏉冪鍥�;10=宸茬鍥�;11=宸茶繃鍙�;12=鍙栨秷锛圵MS锛�;")
+ @TableField(exist = false)
+ private Integer jobStatus;
+
+ @ApiModelProperty(value = "鏈�鍚庢搷浣滀汉鍚嶇О", example = "1")
+ @ExcelColumn(name="鏈�鍚庢搷浣滀汉鍚嶇О",index = 13,width = 12)
+ @TableField(exist = false)
+ private String editUserName;
+
@ApiModelProperty(value = "瀹℃壒淇℃伅鏁版嵁")
@TableField(exist = false)
private ApproveDataVO approveDateVO;
--
Gitblit v1.9.3