From e9f63daae49f506b7f32cae89a0fc59fd4f806fa Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Mon, 21 Apr 2025 09:55:14 +0800
Subject: [PATCH] birthday

---
 .../java/com/bonus/system/api/domain/SysUser.java  | 14 ++++++++++++++
 .../main/resources/mapper/system/SysUserMapper.xml |  7 ++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysUser.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysUser.java
index 24a474b..f470cb5 100644
--- a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysUser.java
+++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysUser.java
@@ -6,6 +6,7 @@ import com.bonus.common.core.annotation.Excel.Type;
 import com.bonus.common.core.annotation.Excels;
 import com.bonus.common.core.web.domain.BaseEntity;
 import com.bonus.common.core.xss.Xss;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -90,6 +91,11 @@ public class SysUser extends BaseEntity {
      */
     private String photoUrl;
 
+    /** 生日 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date birthday;
+
     /**
      * 密码
      */
@@ -276,6 +282,14 @@ public class SysUser extends BaseEntity {
         this.photoUrl = photoUrl;
     }
 
+    public Date getBirthday() {
+        return birthday;
+    }
+
+    public void setBirthday(Date birthday) {
+        this.birthday = birthday;
+    }
+
     public String getPassword() {
         return password;
     }
diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml
index 757e13f..e7ce897 100644
--- a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -16,6 +16,7 @@
         <result property="sex" column="sex"/>
         <result property="avatar" column="avatar"/>
         <result property="photoUrl" column="photo_url"/>
+        <result property="birthday" column="birthday"/>
         <result property="password" column="password"/>
         <result property="status" column="status"/>
         <result property="delFlag" column="del_flag"/>
@@ -69,6 +70,7 @@
                u.email,
                u.avatar,
                u.photo_url,
+               u.birthday,
                u.phonenumber,
                u.password,
                u.sex,
@@ -104,7 +106,7 @@
     </sql>
 
     <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
-        select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber,u.sex, u.status,
+        select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber,u.sex, u.status, u.birthday,
         u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,u.approval_status,u.is_permanent,u.is_built_in, d.dept_name,
         d.leader,r.role_id,
         r.role_name,
@@ -271,6 +273,7 @@
         <if test="nickName != null and nickName != ''">nick_name,</if>
         <if test="email != null and email != ''">email,</if>
         <if test="avatar != null and avatar != ''">avatar,</if>
+        <if test="birthday != null and birthday != ''">birthday,</if>
         <if test="phonenumber != null and phonenumber != ''">phonenumber,</if>
         <if test="sex != null and sex != ''">sex,</if>
         <if test="password != null and password != ''">password,</if>
@@ -290,6 +293,7 @@
         <if test="nickName != null and nickName != ''">#{nickName},</if>
         <if test="email != null and email != ''">#{email},</if>
         <if test="avatar != null and avatar != ''">#{avatar},</if>
+        <if test="birthday != null and birthday != ''">#{birthday},</if>
         <if test="phonenumber != null and phonenumber != ''">#{phonenumber},</if>
         <if test="sex != null and sex != ''">#{sex},</if>
         <if test="password != null and password != ''">#{password},</if>
@@ -316,6 +320,7 @@
             <if test="sex != null and sex != ''">sex = #{sex},</if>
             <if test="avatar != null and avatar != ''">avatar = #{avatar},</if>
             <if test="photoUrl != null and photoUrl != ''">photo_url = #{photoUrl},</if>
+            <if test="birthday != null and birthday != ''">birthday = #{birthday},</if>
             <if test="password != null and password != ''">password = #{password},</if>
             <if test="status != null and status != ''">status = #{status},</if>
             <if test="loginIp != null and loginIp != ''">login_ip = #{loginIp},</if>