From f4a8ad9cff8a253b81d0b9923cc137a6cc44d3cb Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Wed, 4 Jun 2025 16:14:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E7=94=A8=E6=88=B7=E7=94=9F?=
 =?UTF-8?q?=E6=95=88=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/bonus/system/api/domain/SysUser.java  | 26 +++++++++++++++++
 .../resources/mapper/system/SysUserMapper.xml | 29 +++++++++++++------
 2 files changed, 46 insertions(+), 9 deletions(-)

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 1257c9c..f3538cf 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
@@ -169,6 +169,16 @@ public class SysUser extends BaseEntity {
     /**是否内置，0内置，1非内置*/
     private String isBuiltIn = "1";
 
+    /** 临时用户生效开始日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "生效开始日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private String effectiveStartDay;
+
+    /** 临时用户生效截止日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "生效截止日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private String effectiveEndDay;
+
     public SysUser() {
 
     }
@@ -428,4 +438,20 @@ public class SysUser extends BaseEntity {
     public void setIsBuiltIn(String isBuiltIn) {
         this.isBuiltIn = isBuiltIn;
     }
+
+    public String getEffectiveStartDay() {
+        return effectiveStartDay;
+    }
+
+    public void setEffectiveStartDay(String effectiveStartDay) {
+        this.effectiveStartDay = effectiveStartDay;
+    }
+
+    public String getEffectiveEndDay() {
+        return effectiveEndDay;
+    }
+
+    public void setEffectiveEndDay(String effectiveEndDay) {
+        this.effectiveEndDay = effectiveEndDay;
+    }
 }
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 f659fc9..fb4e65a 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
@@ -31,6 +31,8 @@
         <result property="approvalStatus" column="approval_status"/>
         <result property="isPermanent" column="is_permanent"/>
         <result property="isBuiltIn" column="is_built_in"/>
+        <result property="effectiveStartDay" column="effective_start_day"/>
+        <result property="effectiveEndDay" column="effective_end_day"/>
         <association property="dept" javaType="SysDept" resultMap="deptResult"/>
         <collection property="roles" javaType="java.util.List" resultMap="RoleResult"/>
 
@@ -97,7 +99,9 @@
                r.data_scope,
                r.status as role_status,
                u.login_type,
-               u.is_built_in
+               u.is_built_in,
+               u.effective_start_day,
+               u.effective_end_day
         from sys_user u
                  left join sys_dept d on u.dept_id = d.dept_id
                  left join sys_user_role ur on u.user_id = ur.user_id
@@ -106,14 +110,15 @@
     </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, u.birthday, u.photo_url,
-        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,
-        r.role_key,
-        r.role_sort,
-        r.data_scope,
-        r.status as role_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, u.photo_url, u.effective_start_day, u.effective_end_day,
+                d.dept_name, d.leader,r.role_id,
+                r.role_name,
+                r.role_key,
+                r.role_sort,
+                r.data_scope,
+                r.status as role_status
         from sys_user u
         left join sys_dept d on u.dept_id = d.dept_id
         left join sys_user_role ur on u.user_id = ur.user_id
@@ -284,6 +289,8 @@
         <if test="approvalStatus != null and approvalStatus!=''">approval_status,</if>
         <if test="isPermanent != null and isPermanent!=''">is_permanent,</if>
         <if test="isBuiltIn != null and isBuiltIn!=''">is_built_in,</if>
+        <if test="effectiveStartDay != null and effectiveStartDay !=''">effective_start_day,</if>
+        <if test="effectiveEndDay != null and effectiveEndDay !=''">effective_end_day,</if>
         create_time, update_time
         )values(
         <if test="userId != null and userId != ''">#{userId},</if>
@@ -304,6 +311,8 @@
         <if test="approvalStatus != null and approvalStatus!=''">#{approvalStatus},</if>
         <if test="isPermanent != null and isPermanent!=''">#{isPermanent},</if>
         <if test="isBuiltIn != null and isBuiltIn!=''">#{isBuiltIn},</if>
+        <if test="effectiveStartDay != null and effectiveStartDay !=''">#{effectiveStartDay},</if>
+        <if test="effectiveEndDay != null and effectiveEndDay !=''">#{effectiveEndDay},</if>
         sysdate(), sysdate()
         )
     </insert>
@@ -330,6 +339,8 @@
             <if test="loginType != null and loginType!=''">login_type = #{loginType},</if>
             <if test="isPermanent != null and isPermanent!=''">is_permanent = #{isPermanent},</if>
             <if test="isBuiltIn != null and isBuiltIn!=''">is_built_in = #{isBuiltIn},</if>
+            <if test="effectiveStartDay != null and effectiveStartDay !=''">effective_start_day = #{effectiveStartDay},</if>
+            <if test="effectiveEndDay != null and effectiveEndDay !=''">effective_end_day = #{effectiveEndDay},</if>
             update_time = sysdate()
         </set>
         where user_id = #{userId}