修改时间范围日期格式

RuoYi

2024-07-08 fcccbde28b3ad8597abec1b2015ac13b269f8820

 src/main/resources/mybatis/system/SysUserMapper.xml

@@ -4,50 +4,51 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">

<mapper namespace="com.ruoyi.project.system.mapper.SysUserMapper">



   <resultMap type="SysUser" id="SysUserResult">

      <id     property="userId"       column="user_id"      />

      <result property="deptId"       column="dept_id"      />

      <result property="userName"     column="user_name"    />

      <result property="nickName"     column="nick_name"    />

      <result property="email"        column="email"        />

      <result property="phonenumber"  column="phonenumber"  />

      <result property="sex"          column="sex"          />

      <result property="avatar"       column="avatar"       />

      <result property="password"     column="password"     />

      <result property="status"       column="status"       />

      <result property="delFlag"      column="del_flag"     />

      <result property="loginIp"      column="login_ip"     />

      <result property="loginDate"    column="login_date"   />

      <result property="createBy"     column="create_by"    />

      <result property="createTime"   column="create_time"  />

      <result property="updateBy"     column="update_by"    />

      <result property="updateTime"   column="update_time"  />

      <result property="remark"       column="remark"       />

      <association property="dept"    column="dept_id" javaType="SysDept" resultMap="deptResult" />

      <collection  property="roles"   javaType="java.util.List"        resultMap="RoleResult" />

   </resultMap>

    <resultMap type="SysUser" id="SysUserResult">

        <id     property="userId"       column="user_id"      />

        <result property="deptId"       column="dept_id"      />

        <result property="userName"     column="user_name"    />

        <result property="nickName"     column="nick_name"    />

        <result property="email"        column="email"        />

        <result property="phonenumber"  column="phonenumber"  />

        <result property="sex"          column="sex"          />

        <result property="avatar"       column="avatar"       />

        <result property="password"     column="password"     />

        <result property="status"       column="status"       />

        <result property="delFlag"      column="del_flag"     />

        <result property="loginIp"      column="login_ip"     />

        <result property="loginDate"    column="login_date"   />

        <result property="createBy"     column="create_by"    />

        <result property="createTime"   column="create_time"  />

        <result property="updateBy"     column="update_by"    />

        <result property="updateTime"   column="update_time"  />

        <result property="remark"       column="remark"       />

        <association property="dept"    javaType="SysDept"         resultMap="deptResult" />

        <collection  property="roles"   javaType="java.util.List"  resultMap="RoleResult" />

    </resultMap>

   

   <resultMap id="deptResult" type="SysDept">

      <id     property="deptId"   column="dept_id"     />

      <result property="parentId" column="parent_id"   />

      <result property="deptName" column="dept_name"   />

      <result property="orderNum" column="order_num"   />

      <result property="leader"   column="leader"      />

      <result property="status"   column="dept_status" />

   </resultMap>

    <resultMap id="deptResult" type="SysDept">

        <id     property="deptId"    column="dept_id"     />

        <result property="parentId"  column="parent_id"   />

        <result property="deptName"  column="dept_name"   />

        <result property="ancestors" column="ancestors"   />

        <result property="orderNum"  column="order_num"   />

        <result property="leader"    column="leader"      />

        <result property="status"    column="dept_status" />

    </resultMap>

   

   <resultMap id="RoleResult" type="SysRole">

      <id     property="roleId"       column="role_id"        />

      <result property="roleName"     column="role_name"      />

      <result property="roleKey"      column="role_key"       />

      <result property="roleSort"     column="role_sort"      />

      <result property="dataScope"     column="data_scope"    />

      <result property="status"       column="role_status"    />

   </resultMap>

    <resultMap id="RoleResult" type="SysRole">

        <id     property="roleId"       column="role_id"        />

        <result property="roleName"     column="role_name"      />

        <result property="roleKey"      column="role_key"       />

        <result property="roleSort"     column="role_sort"      />

        <result property="dataScope"    column="data_scope"     />

        <result property="status"       column="role_status"    />

    </resultMap>

   

   <sql id="selectUserVo">

        select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, 

        d.dept_id, d.parent_id, d.dept_name, d.order_num, d.leader, d.status as dept_status,

        d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,

        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

@@ -56,9 +57,12 @@
    </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.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u

      select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u

      left join sys_dept d on u.dept_id = d.dept_id

      where u.del_flag = '0'

      <if test="userId != null and userId != 0">

         AND u.user_id = #{userId}

      </if>

      <if test="userName != null and userName != ''">

         AND u.user_name like concat('%', #{userName}, '%')

      </if>

@@ -69,10 +73,10 @@
         AND u.phonenumber like concat('%', #{phonenumber}, '%')

      </if>

      <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->

         AND date_format(u.create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')

         AND date_format(u.create_time,'%Y%m%d') &gt;= date_format(#{params.beginTime},'%Y%m%d')

      </if>

      <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->

         AND date_format(u.create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')

         AND date_format(u.create_time,'%Y%m%d') &lt;= date_format(#{params.endTime},'%Y%m%d')

      </if>

      <if test="deptId != null and deptId != 0">

         AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors) ))

@@ -118,7 +122,7 @@
   

   <select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">

       <include refid="selectUserVo"/>

      where u.user_name = #{userName}

      where u.user_name = #{userName} and u.del_flag = '0'

   </select>

   

   <select id="selectUserById" parameterType="Long" resultMap="SysUserResult">

@@ -126,16 +130,16 @@
      where u.user_id = #{userId}

   </select>

   

   <select id="checkUserNameUnique" parameterType="String" resultType="int">

      select count(1) from sys_user where user_name = #{userName} limit 1

   <select id="checkUserNameUnique" parameterType="String" resultMap="SysUserResult">

      select user_id, user_name from sys_user where user_name = #{userName} and del_flag = '0' limit 1

   </select>

   

   <select id="checkPhoneUnique" parameterType="String" resultMap="SysUserResult">

      select user_id, phonenumber from sys_user where phonenumber = #{phonenumber} limit 1

      select user_id, phonenumber from sys_user where phonenumber = #{phonenumber} and del_flag = '0' limit 1

   </select>

   

   <select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">

      select user_id, email from sys_user where email = #{email} limit 1

      select user_id, email from sys_user where email = #{email} and del_flag = '0' limit 1

   </select>

   

   <insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">