From 1c20c8231980a8d4b91688ff8641a06d3b2f68ab Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 14 十月 2025 16:34:22 +0800
Subject: [PATCH] 改bug
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Cars.java | 150 ++++++++++++++++++++++++++++++++++++++------------
1 files changed, 114 insertions(+), 36 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 5707e3d..3d8f838 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,14 +2,14 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.model.LoginUserModel;
+import com.doumee.service.business.third.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
+
import java.util.Date;
import java.util.List;
@@ -25,132 +25,156 @@
@TableId(value = "id",type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
- @ExcelColumn(name="涓婚敭")
+// @ExcelColumn(name="涓婚敭")
private Integer id;
@ApiModelProperty(value = "鍒涘缓浜虹紪鐮�")
- @ExcelColumn(name="鍒涘缓浜虹紪鐮�")
+ //@ExcelColumn(name="鍒涘缓浜虹紪鐮�")
private Integer creator;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @ExcelColumn(name="鍒涘缓鏃堕棿")
+ //@ExcelColumn(name="鍒涘缓鏃堕棿")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�")
- @ExcelColumn(name="鏇存柊浜虹紪鐮�")
+ //@ExcelColumn(name="鏇存柊浜虹紪鐮�")
private Integer edirot;
@ApiModelProperty(value = "鏇存柊鏃堕棿")
- @ExcelColumn(name="鏇存柊鏃堕棿")
+ //@ExcelColumn(name="鏇存柊鏃堕棿")
private Date editDate;
@ApiModelProperty(value = "鎺堟潈寮�濮嬫椂闂�")
- @ExcelColumn(name="鎺堟潈寮�濮嬫椂闂�")
+ //@ExcelColumn(name="鎺堟潈寮�濮嬫椂闂�")
+ @ExcelColumn(name="寮�濮嬫椂闂�" ,index = 10,width = 12)
private Date startTime;
@ApiModelProperty(value = "鎺堟潈缁撴潫鏃堕棿")
- @ExcelColumn(name="鎺堟潈缁撴潫鏃堕棿")
+ //@ExcelColumn(name="鎺堟潈缁撴潫鏃堕棿")
+ @ExcelColumn(name="缁撴潫鏃堕棿" ,index = 11,width = 12)
private Date endTime;
@ApiModelProperty(value = "鏈�鍚庝竴娆¤繘鍘傛椂闂�")
- @ExcelColumn(name="鏈�鍚庝竴娆¤繘鍘傛椂闂�")
+ //@ExcelColumn(name="鏈�鍚庝竴娆¤繘鍘傛椂闂�")
private Date lastInDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
- @ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
+ //@ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
private Integer isdeleted;
@ApiModelProperty(value = "鎺堟潈鏃堕棿绫诲瀷 0闀挎湡鏈夋晥 1鑷畾涔� 2杞︿富鏈夋晥鏈�", example = "1")
- @ExcelColumn(name="鎺堟潈鏃堕棿绫诲瀷 0闀挎湡鏈夋晥 1鑷畾涔� 2杞︿富鏈夋晥鏈�")
+ //@ExcelColumn(name="鎺堟潈鏃堕棿绫诲瀷 0闀挎湡鏈夋晥 1鑷畾涔� 2杞︿富鏈夋晥鏈�")
private Integer authTimeType;
@ApiModelProperty(value = "澶囨敞")
- @ExcelColumn(name="澶囨敞")
+ //@ExcelColumn(name="澶囨敞")
private String remark;
@ApiModelProperty(value = "棰勭害鏍囪瘑", example = "1")
- @ExcelColumn(name="棰勭害鏍囪瘑")
+ //@ExcelColumn(name="棰勭害鏍囪瘑")
private String hkId;
@ApiModelProperty(value = "鎺掑簭鐮�", example = "1")
- @ExcelColumn(name="鎺掑簭鐮�")
+ //@ExcelColumn(name="鎺掑簭鐮�")
private Integer sortnum;
@ApiModelProperty(value = "杞︾墝鍙�")
- @ExcelColumn(name="杞︾墝鍙�")
+ @ExcelColumn(name="杞︾墝鍙�" ,index = 1,width = 8)
private String code;
@ApiModelProperty(value = "鎺堟潈鍋滆溅缂栫爜闆嗗悎锛堝叧鑱攑arks)", example = "1")
- @ExcelColumn(name="鎺堟潈鍋滆溅缂栫爜闆嗗悎锛堝叧鑱攑arks)")
+ //@ExcelColumn(name="鎺堟潈鍋滆溅缂栫爜闆嗗悎锛堝叧鑱攑arks)")
private String parkId;
@ApiModelProperty(value = "娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�", example = "1")
- @ExcelColumn(name="娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�")
+ //@ExcelColumn(name="娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�")
private Integer hkStatus;
@ApiModelProperty(value = "娴峰悍鏈�杩戝悓姝ユ椂闂�")
- @ExcelColumn(name="娴峰悍鏈�杩戝悓姝ユ椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@ExcelColumn(name="娴峰悍鏈�杩戝悓姝ユ椂闂�")
private Date hkDate;
@ApiModelProperty(value = "褰掑睘浜虹紪鐮�", example = "1")
- @ExcelColumn(name="褰掑睘浜虹紪鐮�")
+ //@ExcelColumn(name="褰掑睘浜虹紪鐮�")
private Integer memberId;
@ApiModelProperty(value = "褰掑睘浜篍RP缂栫爜")
- @ExcelColumn(name="褰掑睘浜篍RP缂栫爜")
+ //@ExcelColumn(name="褰掑睘浜篍RP缂栫爜")
private String memberUserId;
@ApiModelProperty(value = "鍏宠仈EPR鏍囪瘑")
- @ExcelColumn(name="鍏宠仈EPR鏍囪瘑")
+ //@ExcelColumn(name="鍏宠仈EPR鏍囪瘑")
private String erpId;
@ApiModelProperty(value = "鐘舵�� 0绂佺敤 1鍚敤", example = "1")
- @ExcelColumn(name="鐘舵�� 0绂佺敤 1鍚敤")
+ //@ExcelColumn(name="鐘舵�� 0绂佺敤 1鍚敤")
private Integer status;
+
+ @ApiModelProperty(value = "鐘舵�� 0涓嶅湪鍥� 1鍦ㄥ洯", example = "1")
+ //@ExcelColumn(name="鐘舵�� 0涓嶅湪鍥� 1鍦ㄥ洯")
+ private Integer inStatus;
@ApiModelProperty(value = "鎺堟潈鐘舵�� 0鍚� 1鏄�", example = "1")
- @ExcelColumn(name="鎺堟潈鐘舵�� 0鍚� 1鏄�")
+ //@ExcelColumn(name="鎺堟潈鐘舵�� 0鍚� 1鏄�")
private Integer authStatus;
- @ApiModelProperty(value = "鎵�灞炲垎缁勭紪鐮侊紙鍏宠仈car_group)", example = "1")
- @ExcelColumn(name="鎵�灞炲垎缁勭紪鐮侊紙鍏宠仈car_group)")
+ @ApiModelProperty(value = "鎵�灞炵粍缁囦富閿紙鍏宠仈company)", example = "1")
+ //@ExcelColumn(name="鎵�灞炵粍缁囦富閿紙鍏宠仈company)")
private Integer groupId;
- @ApiModelProperty(value = "绫诲瀷 0鍛樺伐杞﹁締 1瀹夋嘲鍏姟杞� 2鑷湁鐗╂祦杞�3澶栧崗鐗╂祦杞� 4甯傚叕鍙哥墿娴佽溅 5甯傚叕鍙告敞鍐岃溅杈�", example = "1")
- @ExcelColumn(name="绫诲瀷 0鍛樺伐杞﹁締 1瀹夋嘲鍏姟杞� 2鑷湁鐗╂祦杞�3澶栧崗鐗╂祦杞� 4甯傚叕鍙哥墿娴佽溅 5甯傚叕鍙告敞鍐岃溅杈�")
+ @ApiModelProperty(value = "绫诲瀷 0瀹夋嘲鍏姟杞� 1瀹夋嘲鑷湁鐗╂祦杞� 2鍏跺畠", example = "1")
+// @ExcelColumn(name="澶囨敞" ,index = 2,width = 8,valueMapping ="0=瀹夋嘲鍏姟杞�;1=瀹夋嘲鑷湁鐗╂祦杞�;2=鍏朵粬" )
private Integer type;
-
+ @ApiModelProperty(value = "鎵�灞炲垎绫荤紪鐮�", example = "1")
+ //@ExcelColumn(name="鎵�灞炲垎绫荤紪鐮�")
+ private Integer cateId;
@ApiModelProperty(value = "鍋滆溅鍦哄悕绉伴泦鍚�", example = "1")
- @ExcelColumn(name="鍋滆溅鍦哄悕绉伴泦鍚�")
+ //@ExcelColumn(name="鍋滆溅鍦哄悕绉伴泦鍚�")
@TableField(exist = false)
+ @ExcelColumn(name="鍋滆溅鍦哄悕绉伴泦鍚�" ,index = 9,width = 10)
private String parksName;
@ApiModelProperty(value = "缂栬緫浜哄鍚�", example = "1")
- @ExcelColumn(name="缂栬緫浜哄鍚�")
+ //@ExcelColumn(name="缂栬緫浜哄鍚�")
@TableField(exist = false)
private String editorName;
@ApiModelProperty(value = "鐢ㄦ埛绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴浜哄憳", example = "1")
- @ExcelColumn(name="鐢ㄦ埛绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴浜哄憳")
+ //@ExcelColumn(name="鐢ㄦ埛绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴浜哄憳")
@TableField(exist = false)
private Integer memberType;
@ApiModelProperty(value = "濮撳悕", example = "1")
- @ExcelColumn(name="濮撳悕")
+ //@ExcelColumn(name="濮撳悕")
@TableField(exist = false)
+ @ExcelColumn(name="杞︿富" ,index = 5,width = 8)
private String memberName;
@ApiModelProperty(value = "杞︿富娴峰悍缂栫爜", example = "1")
@TableField(exist = false)
private String memberHkId;
@ApiModelProperty(value = "鎵嬫満鍙�", example = "1")
- @ExcelColumn(name="鎵嬫満鍙�")
+ //@ExcelColumn(name="鎵嬫満鍙�")
@TableField(exist = false)
+ @ExcelColumn(name="鎵嬫満鍙�" ,index = 6,width = 8)
private String memberPhone;
+ @ApiModelProperty(value = "鎬у埆", example = "1")
+ //@ExcelColumn(name="鎵嬫満鍙�")
+ @TableField(exist = false)
+ @ExcelColumn(name="鎬у埆" ,index = 7,width = 5,valueMapping = "0=鏈煡;1=鐢�;2=濂�")
+ private Integer memberSex;
+ @ApiModelProperty(value = "韬唤璇佸彿", example = "1")
+ //@ExcelColumn(name="鎵嬫満鍙�")
+ @TableField(exist = false)
+ @ExcelColumn(name="韬唤璇佸彿" ,index = 8,width = 10)
+ private String memberCard;
@ApiModelProperty(value = "閮ㄩ棬", example = "1")
- @ExcelColumn(name="閮ㄩ棬")
+ //@ExcelColumn(name="閮ㄩ棬")
@TableField(exist = false)
private String companyName;
+ @ApiModelProperty(value = "閮ㄩ棬绫诲瀷", example = "1")
+ //@ExcelColumn(name="閮ㄩ棬")
+ @TableField(exist = false)
+ private Integer companyType;
@ApiModelProperty(value = "杞︿富鏄惁鍒犻櫎", example = "1")
@TableField(exist = false)
private Integer memberDeleted;
@@ -163,6 +187,47 @@
@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 = "杞﹁締涓氬姟绫诲瀷鍏宠仈categoryBizTYpe", example = "1")
+ @TableField(exist = false)
+ private Integer bizType;
+
+ @ApiModelProperty(value = "鍒嗙被鍚嶇О", example = "1")
+ @TableField(exist = false)
+ private String cateName;
+
+
+ @ApiModelProperty(value = "鎵�灞炲垎绫�", example = "1")
+ @TableField(exist = false)
+ @ExcelColumn(name="鎵�灞炲垎绫�" ,index = 3,width = 10)
+ private String groupCateName;
+
+ @ApiModelProperty(value = "涓�绾у垎绫诲悕绉�", example = "1")
+ @TableField(exist = false)
+ private String catePName;
+ @ApiModelProperty(value = "鏄惁鏂板锛� 0鍚� 1鏄�", example = "1")
+ @TableField(exist = false)
+ private int isnew;
+
+ @ApiModelProperty(value = "杞﹁締閮ㄩ棬鍚嶇О", example = "1")
+ //@ExcelColumn(name="杞﹁締缁勭粐閮ㄩ棬鍚嶇О")
+ @TableField(exist = false)
+ private String carCompanyName;
+
+ @ApiModelProperty(value = "杞﹁締閮ㄩ棬鍏ㄨ矾寰勫悕绉�", example = "1")
+ //@ExcelColumn(name="杞﹁締閮ㄩ棬鍏ㄨ矾寰勫悕绉�")
+ @TableField(exist = false)
+ @ExcelColumn(name="鎵�灞炵粍缁�" ,index = 4,width = 15)
+ private String carCompanyNamePath;
+ @ApiModelProperty(value = "杞︿富瀵硅薄", example = "1")
+ @TableField(exist = false)
+ private Member member;
@ApiModelProperty(value = "鎺堟潈鍋滆溅鍦虹紪鐮侀泦鍚�", example = "1")
@TableField(exist = false)
@@ -174,5 +239,18 @@
@TableField(exist = false)
private List<ParkBook> parkBookList;
+ @ApiModelProperty(value = "浜鸿劯鐓х墖")
+ @TableField(exist = false)
+ private String faceImg;
+ @ApiModelProperty(value = "韬唤璇佸彿锛圡D4鍔犲瘑锛�")
+ @TableField(exist = false)
+ private String idcardNo;
+ @ApiModelProperty(value = "璇佷欢鏄剧ず淇℃伅")
+ @TableField(exist = false)
+ private String idcardDecode;
+ @ApiModelProperty(value = "璇佷欢鏄剧ず淇℃伅")
+ @TableField(exist = false)
+ private String memberCode;
+
}
--
Gitblit v1.9.3