From 2079ba28f20bde46f7736699c97abf0e1564770d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 14 十月 2024 09:30:46 +0800
Subject: [PATCH] 最新版本
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Cars.java | 109 ++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 97 insertions(+), 12 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Cars.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Cars.java
index cbc9720..766948d 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Cars.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Cars.java
@@ -2,6 +2,7 @@
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;
@@ -10,6 +11,7 @@
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
+import java.util.List;
/**
* 杞﹁締淇℃伅琛�
@@ -19,7 +21,7 @@
@Data
@ApiModel("杞﹁締淇℃伅琛�")
@TableName("`cars`")
-public class Cars {
+public class Cars extends LoginUserModel {
@TableId(value = "id",type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
@@ -28,7 +30,7 @@
@ApiModelProperty(value = "鍒涘缓浜虹紪鐮�")
@ExcelColumn(name="鍒涘缓浜虹紪鐮�")
- private String creator;
+ private Integer creator;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
@@ -36,15 +38,27 @@
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�")
@ExcelColumn(name="鏇存柊浜虹紪鐮�")
- private String edirot;
+ private Integer edirot;
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
private Date editDate;
+ @ApiModelProperty(value = "鎺堟潈寮�濮嬫椂闂�")
+ @ExcelColumn(name="鎺堟潈寮�濮嬫椂闂�")
+ private Date startTime;
+ @ApiModelProperty(value = "鎺堟潈缁撴潫鏃堕棿")
+ @ExcelColumn(name="鎺堟潈缁撴潫鏃堕棿")
+ private Date endTime;
+ @ApiModelProperty(value = "鏈�鍚庝竴娆¤繘鍘傛椂闂�")
+ @ExcelColumn(name="鏈�鍚庝竴娆¤繘鍘傛椂闂�")
+ private Date lastInDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
private Integer isdeleted;
+ @ApiModelProperty(value = "鎺堟潈鏃堕棿绫诲瀷 0闀挎湡鏈夋晥 1鑷畾涔� 2杞︿富鏈夋晥鏈�", example = "1")
+ @ExcelColumn(name="鎺堟潈鏃堕棿绫诲瀷 0闀挎湡鏈夋晥 1鑷畾涔� 2杞︿富鏈夋晥鏈�")
+ private Integer authTimeType;
@ApiModelProperty(value = "澶囨敞")
@ExcelColumn(name="澶囨敞")
@@ -62,13 +76,10 @@
@ExcelColumn(name="杞︾墝鍙�")
private String code;
- @ApiModelProperty(value = "杞﹀簱缂栫爜锛堝叧鑱攑arks)", example = "1")
- @ExcelColumn(name="杞﹀簱缂栫爜锛堝叧鑱攑arks)")
- private Integer parkId;
+ @ApiModelProperty(value = "鎺堟潈鍋滆溅缂栫爜闆嗗悎锛堝叧鑱攑arks)", example = "1")
+ @ExcelColumn(name="鎺堟潈鍋滆溅缂栫爜闆嗗悎锛堝叧鑱攑arks)")
+ private String parkId;
- @ApiModelProperty(value = "娴峰悍鏍囪瘑", example = "1")
- @ExcelColumn(name="娴峰悍鏍囪瘑")
- private String hkId2;
@ApiModelProperty(value = "娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�", example = "1")
@ExcelColumn(name="娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�")
@@ -76,7 +87,6 @@
@ApiModelProperty(value = "娴峰悍鏈�杩戝悓姝ユ椂闂�")
@ExcelColumn(name="娴峰悍鏈�杩戝悓姝ユ椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date hkDate;
@ApiModelProperty(value = "褰掑睘浜虹紪鐮�", example = "1")
@@ -95,10 +105,34 @@
@ExcelColumn(name="鐘舵�� 0绂佺敤 1鍚敤")
private Integer status;
- @ApiModelProperty(value = "鍋滆溅鍦哄悕绉�", example = "1")
- @ExcelColumn(name="鍋滆溅鍦哄悕绉�")
+ @ApiModelProperty(value = "鐘舵�� 0涓嶅湪鍥� 1鍦ㄥ洯", example = "1")
+ @ExcelColumn(name="鐘舵�� 0涓嶅湪鍥� 1鍦ㄥ洯")
+ private Integer inStatus;
+ @ApiModelProperty(value = "鎺堟潈鐘舵�� 0鍚� 1鏄�", example = "1")
+ @ExcelColumn(name="鎺堟潈鐘舵�� 0鍚� 1鏄�")
+ private Integer authStatus;
+
+
+ @ApiModelProperty(value = "鎵�灞炵粍缁囦富閿紙鍏宠仈company)", example = "1")
+ @ExcelColumn(name="鎵�灞炵粍缁囦富閿紙鍏宠仈company)")
+ private Integer groupId;
+
+ @ApiModelProperty(value = "绫诲瀷 0瀹夋嘲鍏姟杞� 1瀹夋嘲鑷湁鐗╂祦杞� 2鍏跺畠", example = "1")
+ @ExcelColumn(name="绫诲瀷 0瀹夋嘲鍏姟杞� 1瀹夋嘲鑷湁鐗╂祦杞� 2鍏跺畠")
+ private Integer type;
+
+ @ApiModelProperty(value = "鎵�灞炲垎绫荤紪鐮�", example = "1")
+ @ExcelColumn(name="鎵�灞炲垎绫荤紪鐮�")
+ private Integer cateId;
+
+ @ApiModelProperty(value = "鍋滆溅鍦哄悕绉伴泦鍚�", example = "1")
+ @ExcelColumn(name="鍋滆溅鍦哄悕绉伴泦鍚�")
@TableField(exist = false)
private String parksName;
+ @ApiModelProperty(value = "缂栬緫浜哄鍚�", example = "1")
+ @ExcelColumn(name="缂栬緫浜哄鍚�")
+ @TableField(exist = false)
+ private String editorName;
@ApiModelProperty(value = "鐢ㄦ埛绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴浜哄憳", example = "1")
@ExcelColumn(name="鐢ㄦ埛绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴浜哄憳")
@@ -109,6 +143,9 @@
@ExcelColumn(name="濮撳悕")
@TableField(exist = false)
private String memberName;
+ @ApiModelProperty(value = "杞︿富娴峰悍缂栫爜", example = "1")
+ @TableField(exist = false)
+ private String memberHkId;
@ApiModelProperty(value = "鎵嬫満鍙�", example = "1")
@ExcelColumn(name="鎵嬫満鍙�")
@@ -119,5 +156,53 @@
@ExcelColumn(name="閮ㄩ棬")
@TableField(exist = false)
private String companyName;
+ @ApiModelProperty(value = "杞︿富鏄惁鍒犻櫎", example = "1")
+ @TableField(exist = false)
+ private Integer memberDeleted;
+ @ApiModelProperty(value = "杞︿富鎺堟潈鏈夋晥鏈熷紑濮�", example = "1")
+ @TableField(exist = false)
+ private Date memberStartTime;
+ @ApiModelProperty(value = "杞︿富鎺堟潈鏈夋晥鏈熺粨鏉�", example = "1")
+ @TableField(exist = false)
+ private Date memberEndTime;
+ @ApiModelProperty(value = "杞︿富鎺堟潈鐘舵��", example = "1")
+ @TableField(exist = false)
+ private Integer memberAuthStatus;
+ @ApiModelProperty(value = "褰撳墠浣滀笟鏁伴噺", example = "1")
+ @TableField(exist = false)
+ private int jobNum;
+
+ @ApiModelProperty(value = "涓�绾у垎绫讳富閿�", example = "1")
+ @TableField(exist = false)
+ private Integer catePId;
+
+ @ApiModelProperty(value = "鍒嗙被鍚嶇О", example = "1")
+ @TableField(exist = false)
+ private String cateName;
+
+ @ApiModelProperty(value = "涓�绾у垎绫诲悕绉�", example = "1")
+ @TableField(exist = false)
+ private String catePName;
+
+ @ApiModelProperty(value = "杞﹁締閮ㄩ棬鍚嶇О", example = "1")
+ @ExcelColumn(name="杞﹁締缁勭粐閮ㄩ棬鍚嶇О")
+ @TableField(exist = false)
+ private String carCompanyName;
+
+ @ApiModelProperty(value = "杞﹁締閮ㄩ棬鍏ㄨ矾寰勫悕绉�", example = "1")
+ @ExcelColumn(name="杞﹁締閮ㄩ棬鍏ㄨ矾寰勫悕绉�")
+ @TableField(exist = false)
+ private String carCompanyNamePath;
+
+ @ApiModelProperty(value = "鎺堟潈鍋滆溅鍦虹紪鐮侀泦鍚�", example = "1")
+ @TableField(exist = false)
+ private List<Integer> parkIdList;
+ @ApiModelProperty(value = "杞﹁締缂栫爜闆嗗悎", example = "1")
+ @TableField(exist = false)
+ private List<Integer> idList;
+ @ApiModelProperty(value = "杞﹁締鍖呮湡璁板綍闆嗗悎", example = "1")
+ @TableField(exist = false)
+ private List<ParkBook> parkBookList;
+
}
--
Gitblit v1.9.3