From 53b6400ec10c8ca61ccec91c82c358d2488eead8 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 20 十二月 2024 09:50:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Member.java | 213 +++++++++++++++++++++++++++++++++--------------------
1 files changed, 132 insertions(+), 81 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..0234167 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,236 +21,286 @@
@Data
@ApiModel("浜哄憳淇℃伅琛�")
@TableName("`member`")
-public class Member {
+public class Member extends LoginUserModel {
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
- @ExcelColumn(name="涓婚敭")
private Integer id;
@ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
- @ExcelColumn(name="鍒涘缓浜虹紪鐮�")
private Integer creator;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- @ExcelColumn(name="鍒涘缓鏃堕棿")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
- @ExcelColumn(name="鏇存柊浜虹紪鐮�")
private Integer editor;
@ApiModelProperty(value = "鏇存柊鏃堕棿")
- @ExcelColumn(name="鏇存柊鏃堕棿")
- private Date editDate;
+ private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
- @ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
private Integer isdeleted;
@ApiModelProperty(value = "澶囨敞")
- @ExcelColumn(name="澶囨敞")
private String remark;
@ApiModelProperty(value = "鎵�灞炵粍缁囩紪鐮�(鍏宠仈company琛�)", example = "1")
- @ExcelColumn(name="鎵�灞炵粍缁囩紪鐮�(鍏宠仈company琛�)")
private Integer companyId;
@ApiModelProperty(value = "浜鸿劯鐓х墖")
- @ExcelColumn(name="浜鸿劯鐓х墖")
private String faceImg;
@ApiModelProperty(value = "浜鸿劯瀛樺偍鏈嶅姟鍣ㄦ爣璇嗭紙娴峰悍锛�")
- @ExcelColumn(name="浜鸿劯瀛樺偍鏈嶅姟鍣ㄦ爣璇嗭紙娴峰悍锛�")
private String faceServerIndexCode;
@ApiModelProperty(value = "浜鸿劯缂栫爜锛堟捣搴凤級")
- @ExcelColumn(name="浜鸿劯缂栫爜锛堟捣搴凤級")
private String faceId;
@ApiModelProperty(value = "浜鸿劯鍚屾鐘舵�侊紙娴峰悍锛� 0鏈悓姝� 1宸插悓姝� 2鍚屾澶辫触 3涓嶅悎鏍�")
- @ExcelColumn(name="浜鸿劯鍚屾鐘舵�侊紙娴峰悍锛� 0鏈悓姝� 1宸插悓姝� 2鍚屾澶辫触 3涓嶅悎鏍�")
private Integer faceStatus;
@ApiModelProperty(value = "浜鸿劯鍚屾淇℃伅锛堟捣搴凤級")
- @ExcelColumn(name="浜鸿劯鍚屾淇℃伅锛堟捣搴凤級")
private String faceInfo;
@ApiModelProperty(value = "鍋ュ悍鐮�")
- @ExcelColumn(name="鍋ュ悍鐮�")
private String imgurl;
- @ApiModelProperty(value = "绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴浜哄憳", example = "1")
- @ExcelColumn(name="绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴浜哄憳")
+ @ApiModelProperty(value = "绫诲瀷 0鍙告満浜哄憳 1鏅�氳瀹� 2鍐呴儴浜哄憳", example = "1")
private Integer type;
@ApiModelProperty(value = "璁垮鍚嶇О/鍐呴儴浜哄憳")
- @ExcelColumn(name="璁垮鍚嶇О")
+ @ExcelColumn(name="濮撳悕",index = 1,width = 8)
private String name;
-
- @ApiModelProperty(value = "璁垮骞撮緞")
- @ExcelColumn(name="璁垮骞撮緞")
- @JsonFormat(pattern = "yyyy-MM-dd")
- private Date birthday;
+ @ApiModelProperty(value = "鏄惁鏈変汉鑴� ", example = "1")
+ @TableField(exist = false)
+ @ExcelColumn(name="鏄惁鏈変汉鑴�",index = 2,width = 6,valueMapping = "0=鏃�;1=鏈�;")
+ private Integer hasFace;
@ApiModelProperty(value = "鎵嬫満鍙�")
- @ExcelColumn(name="鎵嬫満鍙�")
+ @ExcelColumn(name="鎵嬫満鍙�",index =3 ,width = 9)
private String phone;
+ @ApiModelProperty(value = "璇佷欢鏄剧ず淇℃伅")
+ @ExcelColumn(name="韬唤璇佸彿",index = 4,width = 12)
+ private String idcardDecode;
+ @ApiModelProperty(value = "鎬у埆 1鐢� 2濂� ", example = "1")
+ @ExcelColumn(name="鎬у埆",index = 5,width = 5,valueMapping = "0=鏈煡;1=鐢�;2=濂�;")
+ private Integer sex;
+ @ApiModelProperty(value = "缁勭粐鍚嶇О")
+ @ExcelColumn(name="鎵�灞為儴闂�",index = 6,width = 12)
+ @TableField(exist = false)
+ private String companyName;
+ @ApiModelProperty(value = "宀椾綅鍚嶇О")
+ @ExcelColumn(name="宀椾綅鍚嶇О",index = 7,width = 8)
+ @TableField(exist = false)
+ private String positionName;
+ @ApiModelProperty(value = "鏄惁鍏氬憳 0鍚� 1鏄�", example = "1")
+// @ExcelColumn(name="鏄惁鍏氬憳",index = 8,width = 12,valueMapping = "1=鍏氬憳;2=闈炲厷鍛�;")
+ private Integer isDangyuan;
+ @ApiModelProperty(value = "鍏ヨ亴濡傛湡")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @ExcelColumn(name="鍏ヨ亴鏃ユ湡",index =9,width = 10, dateFormat = "yyyy-MM-dd")
+ private Date jobDate;
+ @ApiModelProperty(value = "鍩硅缁撴潫鏃堕棿")
+ @TableField(exist = false)
+ @ExcelColumn(name="鍩硅缁撴潫鏃堕棿",index =10,width = 10, dateFormat = "yyyy-MM-dd")
+ private Date trainEndTime;
+ @ApiModelProperty(value = "缁勭粐绫诲瀷 0鍔冲姟鍏徃 1鍐呴儴缁勭粐")
+ @ExcelColumn(name="閮ㄩ棬绫诲瀷",index = 11,width = 8, valueMapping = "0=鐩稿叧鏂圭粍缁�;1=鍐呴儴缁勭粐;")
+ @TableField(exist = false)
+ private Integer companyType;
+ @ApiModelProperty(value = "鍦ㄨ亴鐘舵�� 0鍦ㄨ亴 1绂昏亴", example = "1")
+ @ExcelColumn(name="鍦ㄨ亴鐘舵��",index = 12,width = 8, valueMapping = "0=鍦ㄨ亴;1=绂昏亴;")
+ private Integer workStatus;
+ @ApiModelProperty(value = "鏄惁鍙嫓璁夸汉 0鍚� 1鏄�", example = "1")
+ @ExcelColumn(name="鏄惁鍙嫓璁夸汉",index = 13,width = 8, valueMapping = "0=鍚�;1=鏄�;")
+ private Integer canVisit;
+ @ApiModelProperty(value = "娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝� 2鍚屾澶辫触 3涓嶇鍚堜笅鍙戞潯浠� 4绛夊緟鍒犻櫎鏉冮檺 ", example = "1")
+ @ExcelColumn(name="娴峰悍鍚屾鐘舵��",index = 14,width = 8, valueMapping = "0=鏈悓姝�;1=宸插悓姝�;2=鍚屾澶辫触;3=涓嶇鍚堜笅鍙戞潯浠�;4=绛夊緟鍒犻櫎鏉冮檺")
+ private Integer hkStatus;
+ @ApiModelProperty(value = "娴峰悍鎺堟潈鐘舵�� 0鏈巿鏉� 1宸叉巿鏉� ", example = "1")
+ @ExcelColumn(name="娴峰悍鎺堟潈鐘舵��",index = 15,width = 8, valueMapping = "0=鏈巿鏉�;1=宸叉巿鏉�;")
+ private Integer authStatus;
+ @ApiModelProperty(value = "闂ㄧ鏈夋晥鏈�", example = "1")
+ @TableField(exist = false)
+ @ExcelColumn(name="闂ㄧ鏈夋晥鏈�",index = 16,width = 15 )
+ private String roleTimeInfo;
+ @ApiModelProperty(value = "鎸佸崱鏁伴噺")
+ @ExcelColumn(name="鎸佸崱鏁伴噺",index = 17,width = 5)
+ @TableField(exist = false)
+ private int memberCardCount;
+ @ExcelColumn(name="宸ュ彿",index = 18,width = 8)
+ private String code;
+ @ApiModelProperty(value = "璁垮骞撮緞")
+ private Date birthday;
+
@ApiModelProperty(value = "韬唤璇佸彿锛圡D4鍔犲瘑锛�")
- @ExcelColumn(name="韬唤璇佸彿锛圡D4鍔犲瘑锛�")
private String idcardNo;
+ @ApiModelProperty(value = "淇敼鐨勮韩浠借瘉鍙� ")
+ @TableField(exist = false)
+ private String idcardNoNew;
- @ApiModelProperty(value = "璇佷欢鏄剧ず淇℃伅")
- @ExcelColumn(name="璇佷欢鏄剧ず淇℃伅")
- private String idcardDecode;
@ApiModelProperty(value = "璇佷欢绫诲瀷 0韬唤璇� 1娓境璇佷欢 2鎶ょ収", example = "1")
- @ExcelColumn(name="璇佷欢绫诲瀷 0韬唤璇� 1娓境璇佷欢 2鎶ょ収")
private Integer idcardType;
+ @ApiModelProperty(value = "鏄惁鏄墿娴佸徃鏈� 0涓嶆槸 1鏄�", example = "1")
+ private Integer isDriver;
- @ApiModelProperty(value = "宸ュ彿")
- @ExcelColumn(name="宸ュ彿")
- private String code;
+
@ApiModelProperty(value = "鐝 0鐧界彮 1澶滅彮")
- @ExcelColumn(name="鐝 0鐧界彮 1澶滅彮")
private Integer classes;
@ApiModelProperty(value = "鐘舵�� 0姝ｅ父 1绂佺敤 2鎷夐粦/鍐荤粨", example = "1")
- @ExcelColumn(name="鐘舵�� 0姝ｅ父 1绂佺敤 2鎷夐粦/鍐荤粨")
private Integer status;
- @ApiModelProperty(value = "鎬у埆 1鐢� 2濂� ", example = "1")
- @ExcelColumn(name="鎬у埆 1鐢� 2濂�")
- private Integer sex;
+
@ApiModelProperty(value = "娣诲姞浜虹紪鐮侊紙鑷叧鑱旓級", example = "1")
- @ExcelColumn(name="娣诲姞浜虹紪鐮侊紙鑷叧鑱旓級")
private Integer parentId;
@ApiModelProperty(value = "寰俊openid")
- @ExcelColumn(name="寰俊openid")
private String openid;
@ApiModelProperty(value = "椋炰功鏍囪瘑")
- @ExcelColumn(name="椋炰功鏍囪瘑")
private String fsId;
@ApiModelProperty(value = "椋炰功鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�", example = "1")
- @ExcelColumn(name="椋炰功鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�")
private Integer fsStatus;
@ApiModelProperty(value = "椋炰功鏈�杩戝悓姝ユ椂闂�")
- @ExcelColumn(name="椋炰功鏈�杩戝悓姝ユ椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date fsDate;
@ApiModelProperty(value = "娴峰悍鏍囪瘑", example = "1")
- @ExcelColumn(name="娴峰悍鏍囪瘑")
private String hkId;
- @ApiModelProperty(value = "娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝� 2鍚屾澶辫触 3涓嶇鍚堜笅鍙戞潯浠� 4绛夊緟鍒犻櫎鏉冮檺 ", example = "1")
- @ExcelColumn(name="娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝� 2鍚屾澶辫触 3涓嶇鍚堜笅鍙戞潯浠� 4绛夊緟鍒犻櫎鏉冮檺")
- private Integer hkStatus;
+
+
@ApiModelProperty(value = "娴峰悍鏈�杩戝悓姝ユ椂闂�")
- @ExcelColumn(name="娴峰悍鏈�杩戝悓姝ユ椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date hkDate;
+
+
+ @ApiModelProperty(value = "宀椾綅缂栫爜锛屽叧鑱攑ositionbiao", example = "1")
+ private Integer positionId;
@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")
- @ExcelColumn(name="ERP鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�")
private Integer erpStatus;
@ApiModelProperty(value = "閽夐拤鏍囪瘑", example = "1")
- @ExcelColumn(name="閽夐拤鏍囪瘑")
private Integer ddId;
@ApiModelProperty(value = "閽夐拤鍚屾鏃堕棿")
- @ExcelColumn(name="閽夐拤鍚屾鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date ddDate;
@ApiModelProperty(value = "閽夐拤P鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�", example = "1")
- @ExcelColumn(name="閽夐拤P鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�")
private Integer ddStatus;
@ApiModelProperty(value = "鐧婚檰瀵嗙爜")
- @ExcelColumn(name="鐧婚檰瀵嗙爜")
private String passward;
- @ApiModelProperty(value = "鏄惁鍙嫓璁夸汉 0鍚� 1鏄�", example = "1")
- @ExcelColumn(name="鏄惁鍙嫓璁夸汉 0鍚� 1鏄�")
- private Integer canVisit;
@ApiModelProperty(value = "鏄惁楂樼骇瀹℃壒浜� 0鍚� 1鏄�", example = "1")
- @ExcelColumn(name="鏄惁楂樼骇瀹℃壒浜� 0鍚� 1鏄�")
private Integer highCheckor;
@ApiModelProperty(value = "闂ㄧ瑙掕壊缂栫爜锛堝叧鑱攄evice_role),澶氫釜鑻辨枃閫楀彿闅斿紑", example = "1")
- @ExcelColumn(name="闂ㄧ瑙掕壊缂栫爜 ")
private String roleId;
@ApiModelProperty(value = "闂ㄧ瑙掕壊鎺堟潈鏃堕棿")
- @ExcelColumn(name="闂ㄧ瑙掕壊鎺堟潈鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date roleDate;
@ApiModelProperty(value = "ERP缁勭粐缂栫爜")
- @ExcelColumn(name="ERP缁勭粐缂栫爜")
private String erpOrgId;
@ApiModelProperty(value = "璁垮鍏徃鍚嶇О")
- @ExcelColumn(name="璁垮鍏徃鍚嶇О")
private String visitCompanyName;
- @ApiModelProperty(value = "缁勭粐鍚嶇О")
+
+ @ApiModelProperty(value = "鏈�鍚庢搷浣滀汉")
@TableField(exist = false)
- private String companyName;
+ private String editorName;
+
+
+ @ApiModelProperty(value = "缁勭粐绫诲瀷 0鍔冲姟鍏徃 1鍐呴儴缁勭粐 澶氫釜浠�,鍒嗗壊")
+ @TableField(exist = false)
+ private String companyTypes;
+ @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;
@ApiModelProperty(value = "瑙掕壊缂栫爜鏌ヨ")
@TableField(exist = false)
private String roleIdParam;
-
@ApiModelProperty(value = "鍓嶇紑鍦板潃")
@TableField(exist = false)
private String prefixUrl;
-
@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)
private Integer isFace;
-
@ApiModelProperty(value = "璁块棶娆℃暟")
@TableField(exist = false)
private Integer visitTimes;
-
@ApiModelProperty(value = "鏈�鍚庤闂椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date lastVisitDate;
-
@ApiModelProperty(value = "闂ㄧ鏈夋晥鏈熷紑濮�")
- @ExcelColumn(name="闂ㄧ鏈夋晥鏈熷紑濮�",index= 5,dateFormat = "yyyy-MM-dd")
private Date startTime;
@ApiModelProperty(value = "缂栫爜闆嗗悎")
@TableField(exist = false)
private List<Integer> idList;
-
@ApiModelProperty(value = "闂ㄧ鏈夋晥鏈熺粨鏉�", example = "1")
- @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 String optRemark;
+
+ @ApiModelProperty(value = "system openid" , hidden = true)
+ @TableField(exist = false)
+ private String systemOpenid;
+
+ @ApiModelProperty(value = "鍩硅寮�濮嬫椂闂�")
+ @TableField(exist = false)
+ private Date trainStartTime;
+
+ @ApiModelProperty(value = "闂ㄧ缁勫悕绉伴泦鍚�")
+ @TableField(exist = false)
+ private List<String> roleNames;
+
+ @ApiModelProperty(value = "鏄惁鏌ヨ鍥哄畾浜哄憳锛�0=鍚︼紱1=鏄�" )
+ @TableField(exist = false)
+ private Integer querySpecial;
}
--
Gitblit v1.9.3