From 0ba11af53ae1f4bc8ce16417fa9c56ac4f1b032c Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期三, 30 七月 2025 18:30:18 +0800
Subject: [PATCH] 会员判断
---
zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java | 148 ++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 139 insertions(+), 9 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java b/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
index 1f5d063..b08a6e2 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java
@@ -1,13 +1,17 @@
package com.ruoyi.domain;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
import lombok.Data;
import lombok.ToString;
+import org.apache.ibatis.type.JdbcType;
import java.io.Serializable;
+import java.sql.Timestamp;
import java.time.LocalDate;
+import java.util.Date;
+import java.util.List;
/**
* @Version 1.0
@@ -16,88 +20,149 @@
*/
@TableName("z_info_user")
@Data
-@ToString
public class ZInfoUser implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "user_id", type = IdType.AUTO)
- private Integer userId;
+ private Long userId;
/**
* 濮撳悕
*/
+ @Excel(name="濮撳悕")
private String nickName;
/**
* 鏇剧敤鍚�
*/
+ @Excel(name="鏇剧敤鍚�")
private String oldName;
/**
* 鎬у埆
*/
+ @Excel(name="鎬у埆",readConverterExp = "0=濂�,1=鐢�")
private Integer sex;
/**
* 鍥界睄
*/
+ @Excel(name="鍥界睄")
private String nationality;
/**
* 姘戞棌
*/
+ @Excel(name="姘戞棌")
private String nation;
/**
- * 濠氬Щ鐘跺喌--0锛氭湭濠氾紝1锛氬凡濠氾紝2锛氱濠�
+ * 濠氬Щ鐘跺喌 0锛氭湭濠氾紝1锛氬凡濠氾紝2锛氱濠�
*/
+ @Excel(name="濠氬Щ鐘跺喌",readConverterExp = "0=鏈,1=宸插,2=绂诲")
private Integer maritalStatus;
/**
* 鏀挎不闈㈣矊
*/
+ @Excel(name="鏀挎不闈㈣矊")
private String politicalOutlook;
/**
* 鐢佃瘽鍙风爜
*/
+ @Excel(name="鐢佃瘽鍙风爜")
private String phoneNumber;
/**
* 韬唤璇佸彿
*/
+ @Excel(name="韬唤璇佸彿")
private String idNum;
/**
* 鎴风睄鍦板潃
*/
+ @Excel(name="鎴风睄鍦板潃")
private String locationAddress;
/**
* 甯镐綇鍦板潃
*/
+ @Excel(name="甯镐綇鍦板潃")
private String alwaysAddress;
/**
* 鎴风睄鍦板叕瀹夋満鍏�
*/
+ @Excel(name="鎴风睄鍦板叕瀹夋満鍏�")
private String locationPolice;
/**
* 甯镐綇鍦板叕瀹夋満鍏�
*/
+ @Excel(name="甯镐綇鍦板叕瀹夋満鍏�")
private String alwaysPolice;
/**
* 鎵�鍦ㄥ崟浣�/瀛︽牎
*/
+ @Excel(name="鎵�鍦ㄥ崟浣�/瀛︽牎")
private String unit;
/**
* 鑱屽姟/韬唤
*/
+ @Excel(name="鑱屽姟/韬唤")
private String position;
+
+ /**
+ * 鎷ユ湁澶栫睄銆佸澶栨案涔呭眳鐣欐潈鎴栬�呴暱鏈熷眳鐣欒鍙殑鎯呭喌,1锛氭湁銆�0锛氭病鏈�
+ */
+ @Excel(name="鎷ユ湁澶栫睄銆佸澶栨案涔呭眳鐣欐潈鎴栬�呴暱鏈熷眳鐣欒鍙殑鎯呭喌",readConverterExp = "0=娌℃湁,1=鏈�")
+ private Integer outStatus;
+
+ /**
+ * 澶栫睄銆佸澶栫浉鍏宠瘉浠跺彿鐮�
+ */
+ @Excel(name = "澶栫睄銆佸澶栫浉鍏宠瘉浠跺彿鐮�")
+ private String idNo;
+
+
+ /**
+ * 鍏ㄧ敓鍛藉懆鏈�
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "鍏ㄧ敓鍛藉懆鏈�", dateFormat = "yyyy-MM-dd")
+ private Date deadDay;
+
+ @Excel(name = "鏄熷骇")
+ private String constellation;
+
+ @Excel(name = "寰俊鍙�")
+ private String wxNo;
+
+ @Excel(name = "qq鍙�")
+ private String qqNo;
+
+ @Excel(name = "鐢熻倴")
+ private String shengXiao;
+
+ @Excel(name = "鏄惁鏄湰瀹跺涵鎴愬憳",readConverterExp = "0=鍚�,1=鏄�")
+ private Integer isMyFamily;
+ /**
+ * 鑷垜浠嬬粛
+ */
+
+ @Excel(name = "鑷垜浠嬬粛")
+ private String selfIntroduction;
+
+ @TableField(exist = false)
+ private String familyName;
+
+ @TableField(exist = false)
+ private String roleName;
/**
* 鍥剧墖鍦板潃
@@ -105,23 +170,88 @@
private String img;
/**
+ * 閰嶅伓id
+ */
+ private Long spouseId;
+
+ /**
* 鐖朵翰鐨刬d
*/
- private Integer fatherId;
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
+
+ private Long fatherId;
/**
* 姣嶄翰鐨刬d
*/
- private Integer momId;
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
+
+ private Long momId;
+
+ /**
+ * 瀹舵棌鐨刬d
+ */
+ private Integer clanId;
/**
* 鍑虹敓骞存湀鏃�
*/
- private LocalDate birth;
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "鍑虹敓鏃堕棿", dateFormat = "yyyy-MM-dd")
+ private Date birth;
+
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date createTime;
+
+ /**
+ * 閭
+ */
+ private String email;
/**
* 涓汉鑳屾櫙鍥剧墖銆佽棰�
*/
private String url;
+ /**
+ * 瀹跺涵id
+ */
+ private Long familyId;
+
+ /**
+ * 瑙掕壊id
+ */
+ private Long roleId;
+
+ /**
+ * 鍏朵粬瀹跺涵鎺堟潈id
+ */
+ private String secondFamilyId;
+
+ /**
+ * 鍒ゆ柇鍞竴鐨勭敤鎴风紪鐮�
+ */
+ private String uaid;
+
+ private Long sysId;
+ /**
+ * 浠ｆ暟
+ */
+ @TableField(exist = false)
+ private Integer identity;
+
+ /**
+ * 閰嶅伓淇℃伅
+ */
+ @TableField(exist = false)
+ private ZInfoUser spouse;
+
+ /**
+ * 瀛愬垪琛�
+ */
+ @TableField(exist = false)
+ private List<ZInfoUser> childList;
}
--
Gitblit v1.9.1