部分新功能

heheng

2 天以前 338f2f5afc7762dabf2409f296d5d023462ed4b5

 multi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -32,8 +32,21 @@
        <result property="deptId"        column="dept_id"          />
        <result property="deptName"        column="dept_name"          />
        <result  property="entryTime"        column="entry_time"          />
        <result property="resignTime"        column="resign_time"          />
        <result property="personType"        column="person_type"          />
        <result property="age"        column="age"          />
        <result property="positional"        column="positional"          />
        <result property="qualification"        column="qualification"          />
        <result property="operationCertificate"        column="operation_certificate"          />

    </resultMap>

    <resultMap id="SysUserVoResult" type="com.gkhy.exam.common.domain.entity.SysUser" extends="SysUserResult">
        <collection property="roles" ofType="com.gkhy.exam.common.domain.entity.SysRole" column="userId = id" select="getReponseData">
            <result     property="roleId"     column="role_id"     />
            <result property="roleName"     column="role_name"     />
        </collection>
    </resultMap>


    <delete id="deleteUserById" parameterType="java.lang.Long">
@@ -46,14 +59,20 @@
        where username=#{username} and del_flag=0 limit 1
    </select>

    <select id="userList"  resultMap="SysUserResult">
    <select id="getReponseData" resultType="com.gkhy.exam.common.domain.entity.SysRole">
        select r.role_name,r.role_id from  sys_user_role ur
        left join sys_role r on r.role_id=ur.role_id
        where ur.user_id = #{userId}
    </select>
    <select id="userList"  resultMap="SysUserVoResult">
        select u.id,u.username,u.name,u.user_type,u.phone,u.parent_id,u.company_id,u.sex,u.status,u.del_flag,u.version,
               u.login_ip,u.login_date,u.create_by,u.create_time,u.remark,c.name as company_name,su.name as parent_name,
                u.dept_id,d.dept_name,u.duty,u.post,u.id_card,u.entry_time
                u.dept_id,d.dept_name,u.duty,u.post,u.id_card,u.entry_time,u.resign_time,u.person_type,u.age,u.positional,u.qualification,u.operation_certificate
        from sys_user u
        left join sys_company c on c.id=u.company_id
        left join sys_user su on su.id=u.parent_id and u.parent_id!=0
        left join sys_dept  d on d.dept_id=u.dept_id

        <where>
            and u.del_flag = 0
            <if test="username != null and username != ''">
@@ -65,14 +84,26 @@
            <if test="status != null and status != ''">
                AND u.status = #{status}
            </if>
            <if test="personType != null">
                AND u.person_type = #{personType}
            </if>
            <if test="qualification != null">
                AND u.qualification = #{qualification}
            </if>
            <if test="userType != null">
                AND u.user_type = #{userType}
            </if>
            <if test="deptId != null">
                AND d.dept_id = #{deptId}
            </if>
            <if test="companyId != null ">
                AND u.company_id = #{companyId}
            </if>
            <if test="phone != null and phone != ''">
                AND u.phone like concat('%', #{phone}, '%')
            </if>
            <if test="post != null and post != ''">
                AND u.post like concat('%', #{post}, '%')
            </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')
@@ -89,6 +120,7 @@
            <if test="params.userType != null and params.userType==0">
                AND u.user_type in (1,2,3,4)
            </if>

        </where>
        order by u.id desc
    </select>
@@ -102,7 +134,8 @@

    <select id="getUserById" resultMap="SysUserResult">
        select u.id,u.username,u.user_type,u.name,u.phone,u.parent_id,u.company_id,u.status,u.sex,u.del_flag,u.version,c.name as company_name,
               c.remain_period,su.name as parent_name,u.dept_id,d.dept_name,u.duty,u.post,u.id_card,u.entry_time
               c.remain_period,su.name as parent_name,u.dept_id,d.dept_name,u.duty,u.post,u.id_card,u.entry_time,u.resign_time,
               u.person_type,u.age,u.positional,u.qualification,u.operation_certificate
        from sys_user u
       left join sys_company c on c.id=u.company_id
       left join sys_user su on su.id=u.parent_id and u.parent_id!=0
@@ -154,4 +187,7 @@
        </if>
    </select>




</mapper>