From ed9c9f07d1f9a5ed027e06feb8f0f5ed2d1756bc Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 07 六月 2024 10:39:25 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java | 68 +++++++++++++++++++++++++++++----
1 files changed, 59 insertions(+), 9 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java
index ed6ed39..3516b64 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.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;
@@ -20,7 +21,7 @@
@Data
@ApiModel("浜哄憳淇℃伅琛�")
@TableName("`member`")
-public class Member {
+public class Member extends LoginUserModel {
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
@@ -75,16 +76,14 @@
private String imgurl;
@ApiModelProperty(value = "绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴浜哄憳", example = "1")
- @ExcelColumn(name="绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴浜哄憳")
+ @ExcelColumn(name="绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴浜哄憳")
private Integer type;
@ApiModelProperty(value = "璁垮鍚嶇О/鍐呴儴浜哄憳")
@ExcelColumn(name="璁垮鍚嶇О")
private String name;
-
@ApiModelProperty(value = "璁垮骞撮緞")
@ExcelColumn(name="璁垮骞撮緞")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date birthday;
@ApiModelProperty(value = "鎵嬫満鍙�")
@@ -94,6 +93,9 @@
@ApiModelProperty(value = "韬唤璇佸彿锛圡D4鍔犲瘑锛�")
@ExcelColumn(name="韬唤璇佸彿锛圡D4鍔犲瘑锛�")
private String idcardNo;
+ @ApiModelProperty(value = "淇敼鐨勮韩浠借瘉鍙� ")
+ @TableField(exist = false)
+ private String idcardNoNew;
@ApiModelProperty(value = "璇佷欢鏄剧ず淇℃伅")
@ExcelColumn(name="璇佷欢鏄剧ず淇℃伅")
@@ -135,7 +137,6 @@
@ApiModelProperty(value = "椋炰功鏈�杩戝悓姝ユ椂闂�")
@ExcelColumn(name="椋炰功鏈�杩戝悓姝ユ椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date fsDate;
@ApiModelProperty(value = "娴峰悍鏍囪瘑", example = "1")
@@ -145,19 +146,23 @@
@ApiModelProperty(value = "娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝� 2鍚屾澶辫触 3涓嶇鍚堜笅鍙戞潯浠� 4绛夊緟鍒犻櫎鏉冮檺 ", example = "1")
@ExcelColumn(name="娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝� 2鍚屾澶辫触 3涓嶇鍚堜笅鍙戞潯浠� 4绛夊緟鍒犻櫎鏉冮檺")
private Integer hkStatus;
+ @ApiModelProperty(value = "娴峰悍鎺堟潈鐘舵�� 0鏈巿鏉� 1宸叉巿鏉� ", example = "1")
+ @ExcelColumn(name="娴峰悍鎺堟潈鐘舵�� 0鏈巿鏉� 1宸叉巿鏉� ")
+ private Integer authStatus;
@ApiModelProperty(value = "娴峰悍鏈�杩戝悓姝ユ椂闂�")
@ExcelColumn(name="娴峰悍鏈�杩戝悓姝ユ椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date hkDate;
+ @ApiModelProperty(value = "鍦ㄨ亴鐘舵�� 0鍦ㄨ亴 1绂昏亴", example = "1")
+ @ExcelColumn(name="鍦ㄨ亴鐘舵�� 0鍦ㄨ亴 1绂昏亴")
+ private Integer workStatus;
@ApiModelProperty(value = "ERP鏍囪瘑", example = "1")
@ExcelColumn(name="ERP鏍囪瘑")
private String erpId;
@ApiModelProperty(value = "ERP鍚屾鏃堕棿")
@ExcelColumn(name="ERP鍚屾鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date erpDate;
@ApiModelProperty(value = "ERP鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�", example = "1")
@@ -170,7 +175,6 @@
@ApiModelProperty(value = "閽夐拤鍚屾鏃堕棿")
@ExcelColumn(name="閽夐拤鍚屾鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date ddDate;
@ApiModelProperty(value = "閽夐拤P鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�", example = "1")
@@ -195,7 +199,6 @@
@ApiModelProperty(value = "闂ㄧ瑙掕壊鎺堟潈鏃堕棿")
@ExcelColumn(name="闂ㄧ瑙掕壊鎺堟潈鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date roleDate;
@ApiModelProperty(value = "ERP缁勭粐缂栫爜")
@@ -209,6 +212,21 @@
@ApiModelProperty(value = "缁勭粐鍚嶇О")
@TableField(exist = false)
private String companyName;
+ @ApiModelProperty(value = "鏈�鍚庢搷浣滀汉")
+ @TableField(exist = false)
+ private String editorName;
+ @ApiModelProperty(value = "缁勭粐绫诲瀷")
+ @TableField(exist = false)
+ private Integer companyType;
+ @ApiModelProperty(value = "缁勭粐缂栫爜璺緞")
+ @TableField(exist = false)
+ private String companyPath;
+ @ApiModelProperty(value = "璐熻矗浜虹紪鐮侊紙鍏宠仈member)")
+ @TableField(exist = false)
+ private Integer headId;
+ @ApiModelProperty(value = "缁勭粐璺緞")
+ @TableField(exist = false)
+ private String companyNamePath;
@ApiModelProperty(value = "缁勭粐娴峰悍缂栫爜")
@TableField(exist = false)
private String hkOrgId;
@@ -223,11 +241,19 @@
@ApiModelProperty(value = "鎺堟潈闂ㄧ缁勭紪鐮侀泦鍚�,銆愯瀹㈢銆戝敮涓�鏍囪瘑",hidden = true )
@TableField(exist = false)
private Integer[] roleIds;
+ @ApiModelProperty(value = "浜哄憳缂栫爜闆嗗悎,銆愯瀹㈢銆戝敮涓�鏍囪瘑",hidden = true )
+ @TableField(exist = false)
+ private List<Integer> ids;
+ @ApiModelProperty(value = "鏈夋晥鏈熺被鍨� 0闀挎湡鏈夋晥 1鑷畾涔�",hidden = true )
+ @TableField(exist = false)
+ private Integer timeType;
//鏆傛棤浣跨敤
@ApiModelProperty(value = "濮撳悕/鎵嬫満鍙�/宸ュ彿")
@TableField(exist = false)
private String keyword;
+
+
@ApiModelProperty(value = "鏄惁鏈変汉鑴革細0=鏃狅紱1=鏈夛紱")
@TableField(exist = false)
@@ -252,4 +278,28 @@
@ExcelColumn(name="闂ㄧ鏈夋晥鏈熺粨鏉�",index= 6,dateFormat = "yyyy-MM-dd")
private Date endTime;
+ @ApiModelProperty(value = "浜鸿劯鐓х墖瀹屾暣鍦板潃")
+ @TableField(exist = false)
+ private String faceImgFull;
+ @ApiModelProperty(value = "浜鸿劯鐓х墖瀹屾暣鍦板潃")
+ @TableField(exist = false)
+ private String imgurlFull;
+ @ApiModelProperty(value = "鏄惁涓荤 0鍚� 1鏄�", example = "1")
+ @TableField(exist = false)
+ private Integer headStatus;
+
+ @ApiModelProperty(value = "闂ㄧ瑙掕壊鍚嶇О")
+ @TableField(exist = false)
+ private String roleName;
+ @ApiModelProperty(value = "鍩硅寮�濮嬫椂闂�")
+ @TableField(exist = false)
+ private Date trainStartTime;
+ @ApiModelProperty(value = "鍩硅缁撴潫鏃堕棿")
+ @TableField(exist = false)
+ private Date trainEndTime;
+
+ @ApiModelProperty(value = "闂ㄧ缁勫悕绉伴泦鍚�")
+ @TableField(exist = false)
+ private List<String> roleNames;
+
}
--
Gitblit v1.9.3