SH-Arbitrate/Mediation-Backend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

新增案件

Browse Source
This commit is contained in:
18792927508
2024-01-30 17:48:46 +08:00
parent 422b37fa69
commit 0f3da093b3
27 changed files with 697 additions and 516 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
+6
View File
@@ -91,6 +91,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select u.dept_id from ms_sys_user_role r
join ms_sys_user u on r.role_id=#{roleId} and r.user_id=u.user_id
</select>
<select id="selectDeptByUserId" resultMap="SysDeptResult">
select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.dept_type,d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time
from ms_sys_dept d join ms_sys_user_dept ud on ud.dept_id=d.dept_id
where ud.user_id=#{userId} and d.del_flag = '0'
</select>
<insert id="insertDept" parameterType="com.ruoyi.common.core.domain.entity.SysDept" useGeneratedKeys="true" keyColumn="dept_id" keyProperty="deptId">
insert into ms_sys_dept(
ruoyi-system/src/main/resources/mapper/system/SysUserDeptMapper.xml
+4 -4
View File
@@ -13,14 +13,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectUserById" parameterType="Long" resultMap="resultMap">
<select id="selectUserDeptById" resultMap="resultMap">
select * from ms_sys_user_dept
where user_id = #{userId}
</select>
<insert id="insert" parameterType="com.ruoyi.common.core.domain.entity.SysUserDept">
<insert id="insert" parameterType="com.ruoyi.common.core.domain.entity.SysUserDept">
insert into ms_sys_user_dept(
user_id,
dept_id
@@ -43,11 +43,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</insert>
<delete id="deleteUserById" parameterType="Long">
<delete id="deleteUserById" >
delete from ms_sys_user_dept where user_id = #{userId}
</delete>
<delete id="deleteUserByIds" parameterType="Long">
<delete id="deleteUserByIds">
delete from ms_sys_user_dept where user_id in
<foreach collection="ids" item="userId" open="(" separator="," close=")">
#{userId}
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+124 -129
View File
@@ -6,7 +6,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<resultMap type="com.ruoyi.common.core.domain.entity.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="idCard" column="id_card" />
@@ -25,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="updateTime" column="update_time" />
<result property="remark" column="remark" />
<result property="specialty" column="specialty" />
<association property="dept" javaType="com.ruoyi.common.core.domain.entity.SysDept" resultMap="deptResult" />
<collection property="dept" javaType="com.ruoyi.common.core.domain.entity.SysDept" resultMap="deptResult" />
<collection property="roles" javaType="java.util.List" resultMap="RoleResult" />
</resultMap>
@@ -50,20 +49,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectUserVo">
select u.user_id, u.dept_id, u.user_name, u.nick_name,u.specialty, 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.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
select u.user_id, u.user_name, u.nick_name,u.specialty, 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,
r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status,u.id_card
from ms_sys_user u
left join ms_sys_dept d on u.dept_id = d.dept_id
left join ms_sys_user_role ur on u.user_id = ur.user_id
left join ms_sys_role r on r.role_id = ur.role_id
</sql>
<select id="selectUserList" parameterType="com.ruoyi.common.core.domain.entity.SysUser" resultMap="SysUserResult">
select u.user_id, u.dept_id, u.nick_name, u.user_name,u.specialty,u.id_card, 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 , r.role_id, r.role_name, d.dept_id
select u.user_id, u.nick_name, u.user_name,u.specialty,u.id_card, 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,
r.role_id, r.role_name
from ms_sys_user u
left join ms_sys_dept d on u.dept_id = d.dept_id
left join ms_sys_user_role ur on u.user_id = ur.user_id
left join ms_sys_role r on r.role_id = ur.role_id
where u.del_flag = '0'
@@ -85,17 +82,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<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')
</if>
<if test="deptId != null and deptId != 0">
AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM ms_sys_dept t WHERE find_in_set(#{deptId}, ancestors) ))
</if>
<!-- 数据范围过滤 -->
${params.dataScope}
</select>
<select id="selectAllocatedList" parameterType="com.ruoyi.common.core.domain.entity.SysUser" resultMap="SysUserResult">
select distinct u.user_id, u.dept_id, u.user_name, u.nick_name,u.specialty,u.id_card, u.email, u.phonenumber, u.status, u.create_time
select distinct u.user_id, u.user_name, u.nick_name,u.specialty,u.id_card, u.email, u.phonenumber, u.status, u.create_time
from ms_sys_user u
left join ms_sys_dept d on u.dept_id = d.dept_id
left join ms_sys_user_role ur on u.user_id = ur.user_id
left join ms_sys_role r on r.role_id = ur.role_id
where u.del_flag = '0' and r.role_id = #{roleId}
@@ -110,9 +105,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<select id="selectUnallocatedList" parameterType="com.ruoyi.common.core.domain.entity.SysUser" resultMap="SysUserResult">
select distinct u.user_id, u.dept_id, u.user_name, u.nick_name,u.specialty,u.id_card, u.email, u.phonenumber, u.status, u.create_time
select distinct u.user_id, u.user_name, u.nick_name,u.specialty,u.id_card, u.email, u.phonenumber, u.status, u.create_time
from ms_sys_user u
left join ms_sys_dept d on u.dept_id = d.dept_id
left join ms_sys_user_role ur on u.user_id = ur.user_id
left join ms_sys_role r on r.role_id = ur.role_id
where u.del_flag = '0' and (r.role_id != #{roleId} or r.role_id IS NULL)
@@ -139,10 +133,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectUserByDeptId" parameterType="Long" resultMap="SysUserResult">
SELECT ud.user_id , ud.nick_name ,u.specialty,ud.phonenumber ,ud.dept_id ,d.dept_name
FROM (SELECT u.user_id , u.nick_name ,u.phonenumber ,u.dept_id
FROM (SELECT u.user_id , u.nick_name ,u.phonenumber ,ud.dept_id
FROM ms_sys_user_post up left join ms_sys_user u on u.user_id = up.user_id
left join ms_sys_user_dept ud on ud.user_id = u.user_id
left join ms_sys_post sp on up.post_id = sp.post_id
where sp.post_code = 'jbr') ud left join ms_sys_dept d on ud.dept_id = d.dept_id
where sp.post_code = 'jbr' and u.del_flag = '0') ud left join ms_sys_dept d on ud.dept_id = d.dept_id
where d.dept_id = #{deptId}
</select>
@@ -173,9 +168,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<select id="selectUserByIdCard" parameterType="String" resultMap="SysUserResult">
select u.*,d.dept_name,ur.role_id
select u.*,ur.role_id
from ms_sys_user u
left join ms_sys_dept d on u.dept_id = d.dept_id
left join ms_sys_user_role ur on u.user_id = ur.user_id
left join ms_sys_role r on r.role_id = ur.role_id
where u.id_card = #{idCard} and u.del_flag = '0' and u.status='0' order by u.create_time limit 1
@@ -183,7 +178,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectUserByPhone" parameterType="String" resultMap="SysUserResult">
select u.*,d.dept_name,ur.role_id
from ms_sys_user u
left join ms_sys_dept d on u.dept_id = d.dept_id
left join ms_sys_user_role ur on u.user_id = ur.user_id
left join ms_sys_role r on r.role_id = ur.role_id
where u.phonenumber = #{phone} and u.del_flag = '0' and u.status='0' order by u.create_time limit 1
@@ -191,16 +185,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectByDeptIdAndRole" resultMap="SysUserResult">
select u.* from
ms_sys_user u
join ms_sys_user_dept ud on ud.user_id = u.user_id
join ms_sys_user_role ur on u.user_id = ur.user_id
join ms_sys_role r on ur.role_id = r.role_id
where u.dept_id = #{deptId} and r.role_name = #{roleName} and u.del_flag = '0' and r.del_flag='0'
where ud.dept_id = #{deptId} and r.role_name = #{roleName} and u.del_flag = '0' and r.del_flag='0'
</select>
<insert id="insertUser" parameterType="com.ruoyi.common.core.domain.entity.SysUser" useGeneratedKeys="true" keyProperty="userId">
insert into ms_sys_user(
<if test="userId != null and userId != 0">user_id,</if>
<if test="deptId != null and deptId != 0">dept_id,</if>
<!-- <if test="deptId != null and deptId != 0">dept_id,</if> -->
<if test="userName != null and userName != ''">user_name,</if>
<if test="nickName != null and nickName != ''">nick_name,</if>
<if test="idCard != null and idCard != ''">id_card,</if>
@@ -216,113 +212,112 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
create_time
)values(
<if test="userId != null and userId != ''">#{userId},</if>
<if test="deptId != null and deptId != ''">#{deptId},</if>
<if test="userName != null and userName != ''">#{userName},</if>
<if test="nickName != null and nickName != ''">#{nickName},</if>
<if test="idCard != null and idCard != ''">#{idCard},</if>
<if test="email != null and email != ''">#{email},</if>
<if test="avatar != null and avatar != ''">#{avatar},</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>
<if test="status != null and status != ''">#{status},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if>
<if test="remark != null and remark != ''">#{remark},</if>
<if test="specialty != null and specialty != ''">#{specialty},</if>
sysdate()
)
</insert>
<insert id="batchSave">
insert into ms_sys_user(
user_id,
dept_id,
user_name,
nick_name,
id_card,
email,
avatar,
phonenumber,
sex,
password,
status,
create_by,
remark,
specialty,
create_time
)values
<foreach item="item" index="index" collection="list" separator=",">
(
#{item.userId},
#{item.deptId},
#{item.userName},
#{item.nickName},
#{item.idCard},
#{item.email},
#{item.avatar},
#{item.phonenumber},
#{item.sex},
#{item.password},
#{item.status},
#{item.createBy},
#{item.remark},
#{item.specialty},
sysdate()
)
</foreach>;
</insert>
<!-- <if test="deptId != null and deptId != ''">#{deptId},</if> -->
<if test="userName != null and userName != ''">#{userName},</if>
<if test="nickName != null and nickName != ''">#{nickName},</if>
<if test="idCard != null and idCard != ''">#{idCard},</if>
<if test="email != null and email != ''">#{email},</if>
<if test="avatar != null and avatar != ''">#{avatar},</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>
<if test="status != null and status != ''">#{status},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if>
<if test="remark != null and remark != ''">#{remark},</if>
<if test="specialty != null and specialty != ''">#{specialty},</if>
sysdate()
)
</insert>
<insert id="batchSave">
insert into ms_sys_user(
user_id,
user_name,
nick_name,
id_card,
email,
avatar,
phonenumber,
sex,
password,
status,
create_by,
remark,
specialty,
create_time
)values
<foreach item="item" index="index" collection="list" separator=",">
(
#{item.userId},
#{item.userName},
#{item.nickName},
#{item.idCard},
#{item.email},
#{item.avatar},
#{item.phonenumber},
#{item.sex},
#{item.password},
#{item.status},
#{item.createBy},
#{item.remark},
#{item.specialty},
sysdate()
)
</foreach>;
</insert>
<update id="updateUser" parameterType="com.ruoyi.common.core.domain.entity.SysUser">
update ms_sys_user
<set>
<if test="deptId != null and deptId != 0">dept_id = #{deptId},</if>
<if test="userName != null and userName != ''">user_name = #{userName},</if>
<if test="nickName != null and nickName != ''">nick_name = #{nickName},</if>
<if test="idCard != null and idCard != ''">id_card = #{idCard},</if>
<if test="email != null ">email = #{email},</if>
<if test="phonenumber != null ">phonenumber = #{phonenumber},</if>
<if test="sex != null and sex != ''">sex = #{sex},</if>
<if test="avatar != null and avatar != ''">avatar = #{avatar},</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>
<if test="loginDate != null">login_date = #{loginDate},</if>
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="specialty != null">specialty = #{specialty},</if>
update_time = sysdate()
</set>
where user_id = #{userId}
</update>
<update id="updateUserAvatar" parameterType="com.ruoyi.common.core.domain.entity.SysUser">
update ms_sys_user set avatar = #{avatar} where user_name = #{userName}
</update>
<update id="resetUserPwd" parameterType="com.ruoyi.common.core.domain.entity.SysUser">
update ms_sys_user set password = #{password} where user_name = #{userName}
</update>
<delete id="deleteUserById" parameterType="Long">
update ms_sys_user set del_flag = '2' where user_id = #{userId}
</delete>
<delete id="deleteUserByIds" parameterType="Long">
update ms_sys_user set del_flag = '2' where user_id in
<foreach collection="array" item="userId" open="(" separator="," close=")">
#{userId}
</foreach>
</delete>
<select id="selectRoleUserByDeptId" parameterType="long" resultMap="SysUserResult">
SELECT u.* FROM ms_sys_user u
INNER JOIN ms_sys_user_role ur ON u.user_id = ur.user_id
INNER JOIN ms_sys_dept d ON u.dept_id = d.dept_id
WHERE ur.role_id = #{roleId} AND d.dept_id = #{deptId};
</select>
<update id="updateUser" parameterType="com.ruoyi.common.core.domain.entity.SysUser">
update ms_sys_user
<set>
<select id="selectUserByRole" resultType="com.ruoyi.common.core.domain.entity.SysUser">
select u.user_id userId,u.user_name userName,u.nick_name nickName,u.specialty from ms_sys_user u
join ms_sys_user_role ur on ur.user_id =u.user_id
join ms_sys_role r on ur.role_id = r.role_id and r.role_name='调解员'
where r.del_flag = '0' and r.status='0' and u.del_flag = '0' and u.status='0'
</select>
<if test="userName != null and userName != ''">user_name = #{userName},</if>
<if test="nickName != null and nickName != ''">nick_name = #{nickName},</if>
<if test="idCard != null and idCard != ''">id_card = #{idCard},</if>
<if test="email != null ">email = #{email},</if>
<if test="phonenumber != null ">phonenumber = #{phonenumber},</if>
<if test="sex != null and sex != ''">sex = #{sex},</if>
<if test="avatar != null and avatar != ''">avatar = #{avatar},</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>
<if test="loginDate != null">login_date = #{loginDate},</if>
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="specialty != null">specialty = #{specialty},</if>
update_time = sysdate()
</set>
where user_id = #{userId}
</update>
<update id="updateUserAvatar" parameterType="com.ruoyi.common.core.domain.entity.SysUser">
update ms_sys_user set avatar = #{avatar} where user_name = #{userName}
</update>
<update id="resetUserPwd" parameterType="com.ruoyi.common.core.domain.entity.SysUser">
update ms_sys_user set password = #{password} where user_name = #{userName}
</update>
<delete id="deleteUserById" parameterType="Long">
update ms_sys_user set del_flag = '2' where user_id = #{userId}
</delete>
<delete id="deleteUserByIds" parameterType="Long">
update ms_sys_user set del_flag = '2' where user_id in
<foreach collection="array" item="userId" open="(" separator="," close=")">
#{userId}
</foreach>
</delete>
<select id="selectRoleUserByDeptId" parameterType="long" resultMap="SysUserResult">
SELECT u.* FROM ms_sys_user u
INNER JOIN ms_sys_user_role ur ON u.user_id = ur.user_id
INNER JOIN ms_sys_user_dept ud on ud.user_id = u.user_id
INNER join ms_sys_dept d on ud.dept_id = d.dept_id
WHERE ur.role_id = #{roleId} AND d.dept_id = #{deptId};
</select>
<select id="selectUserByRole" resultType="com.ruoyi.common.core.domain.entity.SysUser">
select u.user_id userId,u.user_name userName,u.nick_name nickName,u.specialty from ms_sys_user u
join ms_sys_user_role ur on ur.user_id =u.user_id
join ms_sys_role r on ur.role_id = r.role_id and r.role_name='调解员'
where r.del_flag = '0' and r.status='0' and u.del_flag = '0' and u.status='0'
</select>
</mapper>