From a5482140ab58009b2453fe982da1fd9764a7a4ab Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期四, 08 一月 2026 15:32:41 +0800
Subject: [PATCH] 【市一】提供问题统计接口（通过scriptid）
---
smartor/src/main/resources/mapper/smartor/SysUserMapper.xml | 77 ++++++++++++++++++++++++++++----------
1 files changed, 57 insertions(+), 20 deletions(-)
diff --git a/smartor/src/main/resources/mapper/smartor/SysUserMapper.xml b/smartor/src/main/resources/mapper/smartor/SysUserMapper.xml
index 861e149..4ebdb2f 100644
--- a/smartor/src/main/resources/mapper/smartor/SysUserMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SysUserMapper.xml
@@ -6,9 +6,9 @@
<resultMap type="com.ruoyi.common.core.domain.entity.SysUser" id="SysUserResult">
<id property="userId" column="user_id"/>
- <id property="orgid" column="orgid"/>
<id property="hisUserId" column="his_user_id"/>
<result property="deptId" column="dept_id"/>
+ <result property="userCode" column="user_code"/>
<result property="hospInfo" column="hosp_info"/>
<result property="deptInfo" column="dept_info"/>
<result property="userName" column="user_name"/>
@@ -61,6 +61,7 @@
<sql id="selectUserVo">
select u.user_id,
u.dept_id,
+ u.user_code,
u.id_card,
u.hosp_info,
u.dept_info,
@@ -85,7 +86,6 @@
u.create_time,
u.remark,
u.guid,
- u.orgid,
d.dept_id,
d.parent_id,
d.ancestors,
@@ -100,18 +100,19 @@
r.data_scope,
r.status as role_status
from sys_user u
+ left join sys_user_org o on o.user_id = u.user_id
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
left join 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.title,u.his_user_id,u.hosp_info,u.dept_info, u.searchscope, u.dept_id, u.user_type,
+ select u.user_code,u.user_id,u.title,u.his_user_id,u.hosp_info,u.dept_info, u.searchscope, u.dept_id,
+ u.user_type,
u.nick_name, u.user_name,
u.email,u.id_card,
u.avatar,
u.birthday,
- u.orgid,
u.job_phone,
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
@@ -122,7 +123,7 @@
AND u.user_id = #{userId}
</if>
<if test="userName != null and userName != ''">
- AND u.user_name like concat('%', #{userName}, '%')
+ AND u.user_name = #{userName}
</if>
<if test="nickName != null and nickName != ''">
AND u.nick_name like concat('%', #{nickName}, '%')
@@ -136,8 +137,8 @@
<if test="title != null and title != ''">
AND u.title = #{title}
</if>
- <if test="job_phone != null and job_phone != ''">
- AND u.job_phone = #{job_phone}
+ <if test="jobPhone != null and jobPhone != ''">
+ AND u.job_phone = #{jobPhone}
</if>
<if test="birthday != null and birthday != ''">
AND u.birthday = #{birthday}
@@ -165,12 +166,11 @@
<select id="selectAllocatedList" parameterType="com.ruoyi.common.core.domain.entity.SysUser"
resultMap="SysUserResult">
select distinct u.user_id,u.his_user_id,u.title,u.hosp_info,u.dept_info, u.searchscope, u.dept_id, u.user_name,
- u.user_type,
+ u.user_type,u.user_code,
u.nick_name,
u.email,
u.birthday,
u.job_phone,
- u.orgid,
u.phonenumber, u.status,u.id_card,
u.create_time
from sys_user u
@@ -198,10 +198,10 @@
resultMap="SysUserResult">
select distinct u.user_id, u.dept_id, u.hosp_info, u.dept_info,u.searchscope, u.user_name, u.user_type,
u.nick_name,
+ u.user_code,
u.email,
u.his_user_id,
u.title,
- u.orgid,
u.job_phone,
u.birthday,
u.phonenumber, u.status,u.id_card,
@@ -279,7 +279,9 @@
<if test="birthday != null ">birthday,</if>
<if test="hisUserId != null and hisUserId != ''">his_user_id,</if>
<if test="guid != null and guid != ''">guid,</if>
- <if test="orgid != null and orgid != ''">orgid,</if>
+ <if test="deptCode != null and deptCode != ''">dept_code,</if>
+ <if test="deptName != null and deptName != ''">dept_name,</if>
+ <if test="userCode != null and userCode != ''">user_code,</if>
create_time
)values(
<if test="userId != null and userId != ''">#{userId},</if>
@@ -304,9 +306,49 @@
<if test="birthday != null">#{birthday},</if>
<if test="hisUserId != null and hisUserId != ''">#{hisUserId},</if>
<if test="guid != null and guid != ''">#{guid},</if>
- <if test="orgid != null and orgid != ''">#{orgid},</if>
+ <if test="deptCode != null and deptCode != ''">#{deptCode},</if>
+ <if test="deptName != null and deptName != ''">#{deptName},</if>
+ <if test="userCode != null and userCode != ''">#{userCode},</if>
sysdate()
)
+ </insert>
+
+
+ <insert id="batchUser" useGeneratedKeys="true" keyProperty="userId">
+ insert into sys_user(
+ user_id, dept_id, user_name, nick_name, email, avatar, phonenumber, sex, password, status, create_by, remark,
+ user_type, dept_info, hosp_info, searchscope, id_card, title, job_phone, birthday, his_user_id, guid,
+ user_code,
+ create_time
+ ) values
+ <foreach collection="list" item="item" separator=",">
+ (
+ #{item.userId},
+ #{item.deptId},
+ #{item.userName},
+ #{item.nickName},
+ #{item.email},
+ #{item.avatar},
+ #{item.phonenumber},
+ #{item.sex},
+ #{item.password},
+ #{item.status},
+ #{item.createBy},
+ #{item.remark},
+ #{item.userType},
+ #{item.deptInfo},
+ #{item.hospInfo},
+ #{item.searchscope},
+ #{item.idCard},
+ #{item.title},
+ #{item.jobPhone},
+ #{item.birthday},
+ #{item.hisUserId},
+ #{item.guid},
+ #{item.userCode},
+ now()
+ )
+ </foreach>
</insert>
<update id="updateUser" parameterType="com.ruoyi.common.core.domain.entity.SysUser">
@@ -332,7 +374,7 @@
<if test="idCard != null and idCard != ''">id_card=#{idCard},</if>
<if test="jobPhone != null and jobPhone != ''">job_phone=#{jobPhone},</if>
<if test="birthday != null ">birthday=#{birthday},</if>
- <if test="orgid != null ">orgid=#{orgid},</if>
+ <if test="userCode != null ">user_code=#{userCode},</if>
<if test="title != null and title != ''">
title = #{title},
</if>
@@ -344,11 +386,6 @@
where user_id = #{userId}
</update>
- <update id="updateUserStatus" parameterType="com.ruoyi.common.core.domain.entity.SysUser">
- update sys_user
- set status = #{status}
- where user_id = #{userId}
- </update>
<update id="updateUserAvatar" parameterType="com.ruoyi.common.core.domain.entity.SysUser">
update sys_user
@@ -364,12 +401,12 @@
<delete id="deleteUserById" parameterType="Long">
update sys_user
- set del_flag = '2'
+ set del_flag = '1'
where user_id = #{userId}
</delete>
<delete id="deleteUserByIds" parameterType="Long">
- update sys_user set del_flag = '2' where user_id in
+ update sys_user set del_flag = '1' where user_id in
<foreach collection="array" item="userId" open="(" separator="," close=")">
#{userId}
</foreach>
--
Gitblit v1.9.3