From 7ee466ebc953bb5640bcf42f2b8e2a87aa471c21 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 15 四月 2026 20:12:21 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun
---
server/services/src/main/java/com/doumee/dao/business/model/DriverInfo.java | 48 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 42 insertions(+), 6 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/DriverInfo.java b/server/services/src/main/java/com/doumee/dao/business/model/DriverInfo.java
index 7e3a6aa..b7494ce 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/DriverInfo.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/DriverInfo.java
@@ -35,7 +35,7 @@
private Integer createUser;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @ExcelColumn(name = "鍒涘缓鏃堕棿", index = 1, width = 16, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @ExcelColumn(name = "鍒涘缓鏃堕棿", index = 7, width = 18, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -49,19 +49,23 @@
private String remark;
@ApiModelProperty(value = "濮撳悕")
- @ExcelColumn(name = "濮撳悕", index = 2, width = 10)
+ @ExcelColumn(name = "鍙告満濮撳悕", index = 1, width = 10)
private String name;
@ApiModelProperty(value = "鎵嬫満鍙�")
@ExcelColumn(name = "鎵嬫満鍙�", index = 3, width = 12)
private String telephone;
+ @ApiModelProperty(value = "鎬у埆锛�1=鐢凤紱2=濂�", example = "1")
+ @TableField(exist = false)
+ @ExcelColumn(name = "鎬у埆", index = 2, width = 6, valueMapping = "1=鐢凤紱2=濂�")
+ private Integer gender;
+
@ApiModelProperty(value = "韬唤璇佸彿鐮�")
@ExcelColumn(name = "韬唤璇佸彿鐮�", index = 4, width = 18)
private String idcard;
@ApiModelProperty(value = "濠氬Щ鐘舵�侊細0=鏈锛�1=宸插锛�2=绂诲紓锛�3=涓у伓", example = "0")
- @ExcelColumn(name = "濠氬Щ鐘舵��", index = 5, width = 10, valueMapping = "0=鏈;1=宸插;2=绂诲紓;3=涓у伓;")
private Integer maritalStatus;
@ApiModelProperty(value = "鍖哄垝涓婚敭", example = "1")
@@ -77,7 +81,7 @@
private Integer carType;
@ApiModelProperty(value = "杞︾墝鍙�")
- @ExcelColumn(name = "杞︾墝鍙�", index = 6, width = 10)
+ @ExcelColumn(name = "杞︾墝鍙�", index = 6, width = 12)
private String carCode;
@ApiModelProperty(value = "杞﹁締棰滆壊")
@@ -91,9 +95,13 @@
@JsonFormat(pattern = "yyyy-MM-dd")
private Date cardEndDate;
- @ApiModelProperty(value = "鍙告満鐘舵�侊細0=娉ㄥ唽锛�1=寰呭鎵癸紱2=瀹℃壒閫氳繃锛�3=瀹℃壒椹冲洖", example = "0")
- @ExcelColumn(name = "鐘舵��", index = 7, width = 10, valueMapping = "0=娉ㄥ唽;1=寰呭鎵�;2=瀹℃壒閫氳繃;3=瀹℃壒椹冲洖;")
+ @ApiModelProperty(value = "鍙告満鐘舵�侊細0=鍚敤锛�1=绂佺敤锛�", example = "0")
+ @ExcelColumn(name = "鐘舵��", index = 8, width = 8, valueMapping = "0=鍚敤锛�1=绂佺敤锛�")
private Integer status;
+
+ @ApiModelProperty(value = "瀹℃壒鐘舵�侊細0=寰呭鎵癸紱1=瀹℃壒閫氳繃锛�2=瀹℃壒椹冲洖", example = "0")
+ @ExcelColumn(name = "瀹℃壒鐘舵��", index = 9, width = 10, valueMapping = "0=寰呭鎵癸紱1=瀹℃壒閫氳繃锛�2=瀹℃壒椹冲洖")
+ private Integer auditStatus;
@ApiModelProperty(value = "OPENID(APP)")
private String openid;
@@ -120,6 +128,9 @@
@ApiModelProperty(value = "韬唤璇佸弽闈㈢収")
private String idcardImgBack;
+ @ApiModelProperty(value = "鍙告満瀹氱骇锛�( 5 - 1 S A B C D )", example = "1")
+ private Integer driverLevel;
+
@ApiModelProperty(value = "杞﹁締鐓х墖鍒楄〃")
@TableField(exist = false)
private List<Multifile> carImgList = new ArrayList<>();
@@ -140,6 +151,31 @@
@TableField(exist = false)
private String carTypeName;
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鐘舵�佸垪琛�(鏌ヨ鐢�)", example = "0,1,2")
+ private List<Integer> statusList;
+ @TableField(exist = false)
+ @ApiModelProperty(value = "褰撳墠浣欓(鍗曚綅:鍒�)", example = "10000")
+ @ExcelColumn(name = "璐︽埛浣欓", index = 5, width = 12)
+ private Long memberAmount;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鍥剧墖鍓嶇紑鍦板潃")
+ private String imgPrefix;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鏌ヨ鍏抽敭瀛楋紙鍙告満濮撳悕/鎵嬫満鍙凤級")
+ private String keyword;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鍒涘缓寮�濮嬫棩鏈�")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date createTimeStart;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鍒涘缓缁撴潫鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date createTimeEnd;
}
--
Gitblit v1.9.3