From 31ffbaf322685984516cfb284fa58741debf4e96 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: Fri, 29 Jan 2021 09:12:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' into master
---
src/main/java/com/nanometer/smartlab/dao/SysUserDao.xml | 109 ++++++++++++++++++++++++++++++++++--------------------
1 files changed, 69 insertions(+), 40 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/dao/SysUserDao.xml b/src/main/java/com/nanometer/smartlab/dao/SysUserDao.xml
index dffdfb3..e171985 100644
--- a/src/main/java/com/nanometer/smartlab/dao/SysUserDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/SysUserDao.xml
@@ -22,7 +22,8 @@
<result property="updateTime" column="update_time"></result>
<result property="roleName" column="roleName"></result>
<result property="containerCodeList" column="containerCodeList"></result>
- <result property="projectId" column="project_id"></result>
+ <result property="project" column="project"></result>
+ <result property="waster" column="waster" typeHandler="com.nanometer.smartlab.entity.handler.WasterHandler"></result>
</resultMap>
<resultMap id="SysUserDto" type="com.nanometer.smartlab.entity.dto.SysUserDto">
@@ -70,6 +71,15 @@
<if test="editId != null and editId != ''">
and su.id != #{editId}
</if>
+ <if test="waster != null">
+ and su.waster = #{waster}
+ </if>
+ <if test="project != null and project != ''">
+ and su.project like concat("%",#{project},"%")
+ </if>
+ <if test="company != null and company != ''">
+ and bm1.meta_value like concat("%",#{company},"%")
+ </if>
</sql>
<select id="getSysUser" parameterType="java.lang.String" resultMap="SysUser" >
@@ -113,6 +123,7 @@
select su.*, br.name as roleName from sys_user as su
left join base_role as br on su.role_id = br.id
left join base_meta bm on su.department = bm.id
+ left join base_meta bm1 on bm1.id = su.company
where su.valid_flag = 1
<if test="departmentNameLike != null and departmentNameLike != ''">
and bm.meta_value like #{departmentNameLike}
@@ -146,7 +157,9 @@
</select>
<select id="getSysUserTotalCount" parameterType="java.util.Map" resultType="int">
- select count(1) from sys_user as su left join base_meta bm on su.department = bm.id
+ select count(1) from sys_user as su
+ left join base_meta bm on su.department = bm.id
+ left join base_meta bm1 on bm1.id = su.company
where su.valid_flag = 1
<if test="departmentNameLike != null and departmentNameLike != ''">
and bm.meta_value like #{departmentNameLike}
@@ -155,13 +168,13 @@
</select>
<insert id="insertSysUser" parameterType="com.nanometer.smartlab.entity.SysUser">
- insert into sys_user(id, arp, account, password, company, department, name, phone, email, memo, id_card, approver_flag, see_flag, role_id, valid_flag, create_time, update_time,project_id)
- values (#{id}, #{arp}, #{account}, #{password}, #{company}, #{department}, #{name}, #{phone}, #{email}, #{memo}, #{idCard}, #{approverFlag}, #{seeFlag}, #{roleId}, 1, now(), now(),#{projectId})
+ insert into sys_user(id, arp, account, password, company, department, name, phone, email, memo, id_card, approver_flag, see_flag, role_id, valid_flag, create_time, update_time,project,waster)
+ values (#{id}, #{arp}, #{account}, #{password}, #{company}, #{department}, #{name}, #{phone}, #{email}, #{memo}, #{idCard}, #{approverFlag}, #{seeFlag}, #{roleId}, 1, now(), now(),#{project},#{waster})
</insert>
<update id="updateSysUser" parameterType="com.nanometer.smartlab.entity.SysUser">
update sys_user set arp=#{arp}, account=#{account}, password=#{password}, company=#{company}, department=#{department}, name=#{name}, phone=#{phone},
- email=#{email}, memo=#{memo}, id_card=#{idCard}, approver_flag=#{approverFlag}, see_flag=#{seeFlag}, role_id=#{roleId}, point=#{point},update_time=now(),project_id=#{projectId}
+ email=#{email}, memo=#{memo}, id_card=#{idCard}, approver_flag=#{approverFlag}, see_flag=#{seeFlag}, role_id=#{roleId}, point=#{point},update_time=now(),project=#{project},waster=#{waster}
where id=#{id}
</update>
@@ -192,26 +205,11 @@
</select>
- <select id="getUserListByContainerCodeNew" parameterType="java.util.Map" resultMap="SysUser">
- SELECT u.name,u.see_flag,u.role_id,u.valid_flag,u.id_card,bm2.meta_value department,bm1.meta_value company,u.arp,u.point,sp.project
- from sys_user u
- left join base_meta bm1 on bm1.id = u.company
- left join base_meta bm2 on bm2.id = u.department
- LEFT JOIn sys_project sp on sp.id = u.project_id
- where u.project_id = (
- SELECT project_id from sys_laboratory_container
- WHERE container_code = #{0}
- and valid_flag = 1)
- AND u.valid_flag = 1
- and sp.valid_flag = 1
- and u.update_time >= #{1} and #{2} > u.update_time
- </select>
-
<select id="selectByAccount" parameterType="com.nanometer.smartlab.entity.SysUser" resultMap="SysUser">
select * from sys_user where valid_flag=1 and account=#{account}
</select>
<select id="selectUserInfo" resultMap="SysUserDto">
- SELECT
+ SELECT
su.id,
su.arp,
su.account,
@@ -222,33 +220,64 @@
sl.`name` sl_name,
slc.id slc_id,
slc.`name` slc_name
-FROM
- sys_user su
+ FROM sys_user su
LEFT JOIN base_meta bm1 on bm1.id = su.department
LEFT JOIN sys_laboratory sl on sl.department = su.department
LEFT JOIN sys_laboratory_container slc on slc.laboratory_id = sl.id
-
-
-
WHERE su.valid_flag = 1
and sl.valid_flag = 1
and slc.valid_flag = 1
-
- </select>
- <select id="getUserByAccount" resultMap="SysUser">
- select su.*, br.name as roleName from sys_user as su
- left join base_role as br on su.role_id = br.id
- left join base_meta bm on su.department = bm.id
- where su.valid_flag = 1
- and su.account = #{account}
+ ORDER BY su.`name` asc
</select>
+ <select id="getUserListByProject" parameterType="java.util.Map" resultMap="SysUser">
+ SELECT u.name,u.see_flag,u.role_id,u.valid_flag,u.id_card,bm2.meta_value department,bm1.meta_value company,u.arp,u.point,u.project
+ from sys_user u
+ left join base_meta bm1 on bm1.id = u.company
+ left join base_meta bm2 on bm2.id = u.department
+ where
+ u.project = #{0}
+ and u.valid_flag = 1
+ and u.update_time >= #{1} and #{2} > u.update_time
+ </select>
+ <select id="getUserByAccount" resultType="com.nanometer.smartlab.entity.dto.HazardousWasteUser">
+ SELECT
+ su.id,
+ su.account,
+ su.`name`,
+ su.`password`,
+ su.waster as adminFlag,
+ su.project,
+ bm.meta_value as department,
+ com.meta_value as company
+ FROM sys_user AS su
+ LEFT JOIN base_meta bm ON su.department = bm.id
+ LEFT JOIN base_meta com on com.id = su.company
+ <where>
+ su.valid_flag = 1
+ <if test="account != null and account !=''">
+ AND su.account = #{account}
+ </if>
+ <if test="name != null and name !=''">
+ AND su.name = #{name}
+ </if>
+ </where>
+ </select>
+ <select id="getUserByProject" resultType="com.nanometer.smartlab.entity.dto.LaboratoryVo$LaboratoryUser">
+ SELECT
+ `name` as username
+ FROM sys_user
+ WHERE
+ valid_flag = '1'
+ AND waster = '1'
+ AND project = #{project};
+ </select>
<update id="updateUserPointBySelective" parameterType="java.util.Map">
- update sys_user set point=#{point}
- <where>
- <if test="id != null">
- id = #{id}
- </if>
- </where>
+ update sys_user set point=#{point}
+ <where>
+ <if test="id != null">
+ id = #{id}
+ </if>
+ </where>
</update>
</mapper>
--
Gitblit v1.9.2