From 12e8eb9e345adea19972c34df471b28b51fa71dd Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 21 五月 2024 15:34:11 +0800
Subject: [PATCH] 代码初始化
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarUseBook.java | 49 ++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 38 insertions(+), 11 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarUseBook.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarUseBook.java
index 32d6904..218f678 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarUseBook.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarUseBook.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.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -9,6 +11,7 @@
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
+import java.util.List;
/**
* 杞﹁締_鐢ㄨ溅鐢宠淇℃伅琛�
@@ -18,7 +21,7 @@
@Data
@ApiModel("杞﹁締_鐢ㄨ溅鐢宠淇℃伅琛�")
@TableName("`car_use_book`")
-public class CarUseBook {
+public class CarUseBook extends LoginUserModel {
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
@@ -31,7 +34,6 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -40,8 +42,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
- private Date editDate;
+ private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
@@ -61,12 +62,12 @@
@ApiModelProperty(value = "寮�濮嬫椂闂�")
@ExcelColumn(name="寮�濮嬫椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
+// @JsonFormat(pattern = "yyyy-MM-dd")
private Date startTime;
@ApiModelProperty(value = "缁撴潫鏃堕棿")
@ExcelColumn(name="缁撴潫鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+// @JsonFormat(pattern = "yyyy-MM-dd")
private Date endTime;
@ApiModelProperty(value = "棰勮鍑哄彂鏃堕棿")
@@ -119,7 +120,7 @@
@ApiModelProperty(value = "涔樿溅浜虹紪鐮侀泦鍚堬紝澶氫釜鑻辨枃閫楀彿闅斿紑", example = "1")
@ExcelColumn(name="涔樿溅浜虹紪鐮侀泦鍚堬紝澶氫釜鑻辨枃閫楀彿闅斿紑")
- private Integer memberIds;
+ private String memberIds;
@ApiModelProperty(value = "涔樿溅浜哄鍚嶉泦鍚堬紝澶氫釜鑻辨枃閫楀彿闅斿紑")
@ExcelColumn(name="涔樿溅浜哄鍚嶉泦鍚堬紝澶氫釜鑻辨枃閫楀彿闅斿紑")
@@ -141,8 +142,34 @@
@ExcelColumn(name="鍙告満缂栫爜锛堝叧鑱攃ar_driver锛�")
private Integer driverId;
- @ApiModelProperty(value = "鐢ㄨ溅浜哄憳", example = "1")
- @ExcelColumn(name="鐢ㄨ溅浜哄憳")
- private Integer memberNum;
-
+ @ApiModelProperty(value = "鍙告満濮撳悕", example = "1")
+ @TableField(exist = false)
+ private String driverName;
+ @ApiModelProperty(value = "鍙告満鎵嬫満鍙�", example = "1")
+ @TableField(exist = false)
+ private String driverPhone;
+ @ApiModelProperty(value = "鐢宠浜哄鍚�", example = "1")
+ @TableField(exist = false)
+ private String memberName;
+ @ApiModelProperty(value = "鐢宠浜烘墍灞炵粍缁囧悕绉�", example = "1")
+ @TableField(exist = false)
+ private String companyName;
+ @ApiModelProperty(value = "鐢宠浜烘墜鏈哄彿", example = "1")
+ @TableField(exist = false)
+ private String memberPhone;
+ @ApiModelProperty(value = "涔樿溅浜洪泦鍚�", example = "1")
+ @TableField(exist = false)
+ private List<Member> memberList;
+ @ApiModelProperty(value = "鏌ヨ寮�濮嬫椂闂达紙鍩轰簬鍒涘缓鏃堕棿锛�", example = "2024-05-20 11:48:50")
+ @TableField(exist = false)
+ private Date queryStartTime;
+ @ApiModelProperty(value = "鏌ヨ鎴濮嬫椂闂达紙鍩轰簬鍒涘缓鏃堕棿锛�", example = "2024-05-20 11:48:46")
+ @TableField(exist = false)
+ private Date queryEndTime;
+ @ApiModelProperty(value = "鏌ヨ鏃ユ湡", example = "2024-05-20" ,notes = "H5浣跨敤")
+ @TableField(exist = false)
+ private String queryDate;
+ @ApiModelProperty(value = "鐢宠浜虹數璇�")
+ @TableField(exist = false)
+ private String memberMobile;
}
--
Gitblit v1.9.3