From d1e55e8c1eecd46921ed43ad6525f37bb0593f07 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期五, 24 五月 2024 18:13:36 +0800 Subject: [PATCH] 最新版本 --- server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Cars.java | 80 ++++++++++++++++++++++++---------------- 1 files changed, 48 insertions(+), 32 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 8ec76cf..5707e3d 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 @@ -11,6 +11,7 @@ import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import java.util.Date; +import java.util.List; /** * 杞﹁締淇℃伅琛� @@ -42,10 +43,22 @@ @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="澶囨敞") @@ -63,9 +76,9 @@ @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 = "娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�", example = "1") @@ -92,38 +105,14 @@ @ApiModelProperty(value = "鐘舵�� 0绂佺敤 1鍚敤", example = "1") @ExcelColumn(name="鐘舵�� 0绂佺敤 1鍚敤") private Integer status; + @ApiModelProperty(value = "鎺堟潈鐘舵�� 0鍚� 1鏄�", example = "1") + @ExcelColumn(name="鎺堟潈鐘舵�� 0鍚� 1鏄�") + private Integer authStatus; @ApiModelProperty(value = "鎵�灞炲垎缁勭紪鐮侊紙鍏宠仈car_group)", example = "1") @ExcelColumn(name="鎵�灞炲垎缁勭紪鐮侊紙鍏宠仈car_group)") private Integer groupId; - - - @ApiModelProperty(value = "鎺堟潈鏃堕棿绫诲瀷 0闀挎湡鏈夋晥 1鑷畾涔� 2杞︿富鏈夋晥鏈�", example = "1") - @ExcelColumn(name="鎺堟潈鏃堕棿绫诲瀷 0闀挎湡鏈夋晥 1鑷畾涔� 2杞︿富鏈夋晥鏈�") - private Integer authTimeType; - - - // -// @ApiModelProperty(value = "鐘舵�� 0绂佺敤 1鍚敤", example = "1") -// @ExcelColumn(name="鐘舵�� 0绂佺敤 1鍚敤") -// private Integer status; -// -// -// @ApiModelProperty(value = "鐘舵�� 0绂佺敤 1鍚敤", example = "1") -// @ExcelColumn(name="鐘舵�� 0绂佺敤 1鍚敤") -// private Integer status; -// -// @ApiModelProperty(value = "鐘舵�� 0绂佺敤 1鍚敤", example = "1") -// @ExcelColumn(name="鐘舵�� 0绂佺敤 1鍚敤") -// private Integer status; -// -// @ApiModelProperty(value = "鐘舵�� 0绂佺敤 1鍚敤", example = "1") -// @ExcelColumn(name="鐘舵�� 0绂佺敤 1鍚敤") -// private Integer status; - - - @ApiModelProperty(value = "绫诲瀷 0鍛樺伐杞﹁締 1瀹夋嘲鍏姟杞� 2鑷湁鐗╂祦杞�3澶栧崗鐗╂祦杞� 4甯傚叕鍙哥墿娴佽溅 5甯傚叕鍙告敞鍐岃溅杈�", example = "1") @ExcelColumn(name="绫诲瀷 0鍛樺伐杞﹁締 1瀹夋嘲鍏姟杞� 2鑷湁鐗╂祦杞�3澶栧崗鐗╂祦杞� 4甯傚叕鍙哥墿娴佽溅 5甯傚叕鍙告敞鍐岃溅杈�") @@ -131,10 +120,14 @@ - @ApiModelProperty(value = "鍋滆溅鍦哄悕绉�", example = "1") - @ExcelColumn(name="鍋滆溅鍦哄悕绉�") + @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鍐呴儴浜哄憳") @@ -158,5 +151,28 @@ @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 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