From a1e90c3da21d88f994bac9c1feb91bf40e53a44d Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期三, 18 八月 2021 13:01:21 +0800
Subject: [PATCH] 耗材无供应商也显示，申购管理试剂库、申请履历、收藏不显示无效试剂和无供应商试剂 可显示无供应商的耗材
---
src/main/java/com/nanometer/smartlab/dao/SysUserDao.xml | 129 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 122 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/dao/SysUserDao.xml b/src/main/java/com/nanometer/smartlab/dao/SysUserDao.xml
index 06c7961..f5da893 100644
--- a/src/main/java/com/nanometer/smartlab/dao/SysUserDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/SysUserDao.xml
@@ -65,9 +65,6 @@
<if test="seeFlag != null">
and su.see_flag = #{seeFlag}
</if>
- <if test="seeFlag != null">
- and su.see_flag = #{seeFlag}
- </if>
<if test="editId != null and editId != ''">
and su.id != #{editId}
</if>
@@ -87,10 +84,18 @@
where id = #{id} and valid_flag = 1
</select>
- <select id="getUser" parameterType="java.lang.String" resultType="java.util.Map">
- select * from sys_user
+ <select id="getUser" parameterType="java.lang.String" resultMap="SysUser">
+ select
+ sys_user.id,
+ sys_user.`name`,
+ sys_user.phone,
+ sys_user.project,
+ base_meta.meta_value as department
+ from sys_user
left join base_meta on sys_user.department = base_meta.id
- where sys_user.id = #{id} and sys_user.valid_flag = 1
+ where sys_user.id = #{id}
+ and sys_user.valid_flag = 1
+ and base_meta.valid_flag = 1
</select>
<insert id="insertUserFavor" parameterType="java.util.Map">
@@ -116,7 +121,9 @@
<select id="getSysUserByIdCard" parameterType="java.lang.String" resultMap="SysUser" >
select * from sys_user
- where id_card = #{idCard} and valid_flag = 1
+ where id_card = #{idCard}
+ and valid_flag = 1
+ limit 1
</select>
<select id="getSysUserList" parameterType="java.util.Map" resultMap="SysUser">
@@ -276,6 +283,114 @@
select * from sys_user
where arp = #{0} and valid_flag = 1
</select>
+ <select id="getUserCountInProject" parameterType="java.util.Map" resultType="java.lang.Integer">
+ 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 concat("%",#{departmentNameLike},"%")
+ </if>
+ <if test="arp != null and arp != ''">
+ and su.arp like concat("%",#{arp},"%")
+ </if>
+ <if test="name != null and name != ''">
+ and su.name like concat("%",#{name},"%")
+ </if>
+ <if test="company != null and company != ''">
+ and bm1.meta_value like concat("%",#{company},"%")
+ </if>
+ <if test="project != null and project != ''">
+ and
+ <foreach item="item" index="index" collection="project.split(',')" open="(" separator="or" close=")">
+ su.project like concat("%",#{item},"%")
+ </foreach>
+ </if>
+ </select>
+ <select id="getUserInProject" parameterType="java.util.Map" 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
+ 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 concat("%",#{departmentNameLike},"%")
+ </if>
+ <if test="arp != null and arp != ''">
+ and su.arp like concat("%",#{arp},"%")
+ </if>
+ <if test="name != null and name != ''">
+ and su.name like concat("%",#{name},"%")
+ </if>
+ <if test="company != null and company != ''">
+ and bm1.meta_value like concat("%",#{company},"%")
+ </if>
+ <if test="project != null and project != ''">
+ and
+ <foreach item="item" index="index" collection="project.split(',')" open="(" separator="or" close=")">
+ su.project like concat("%",#{item},"%")
+ </foreach>
+ </if>
+ order by su.arp ASC
+ <if test="first != null and pageSize != null">
+ limit #{first}, #{pageSize}
+ </if>
+ </select>
+ <select id="getExportUserList" resultType="Map">
+ select
+ bm.meta_value AS departmentName,
+ bm1.meta_value AS companyName,
+ su.project,
+ su.arp,
+ su.name,
+ su.account,
+ su.id_card as idCard,
+ su.phone,
+ su.email,
+ su.memo,
+ br. NAME AS roleName,
+ CASE WHEN su.approver_flag=0 then '否' else '是' END AS approver,
+ CASE WHEN su.see_flag=2 then '一般人员' WHEN su.see_flag=3 then '安全员' WHEN su.see_flag=11 then '系统管理员'WHEN su.see_flag=0 then '实验室管理员' END AS seeName,
+ CASE WHEN su.waster=2 then '危废管理员' WHEN su.waster=1 then '危废处理人员' else '' END AS wasterName,
+ su.update_time as updateTime
+ 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="arp != null and arp != ''">
+ and su.arp like #{arp}
+ </if>
+ <if test="name != null and name != ''">
+ and su.name like concat("%",#{name},"%")
+ </if>
+ <if test="departmentName != null and departmentName != ''">
+ and su.department like concat("%",#{departmentName},"%")
+ </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>
+ </where>
+ order by su.arp ASC
+ </select>
+ <select id="getLibrarianEmail" resultType="java.lang.String">
+ select su.email
+ from sys_user as su
+ left join base_role as br on br.id = su.role_id
+ where
+ su.valid_flag = 1
+ and br.name = '库管员'
+ and su.email is not null
+ and su.email != ''
+ </select>
+ <select id="getUserByName" resultMap="SysUser">
+ select * from sys_user
+ where name = #{name} and valid_flag = 1
+ </select>
<update id="updateUserPointBySelective" parameterType="java.util.Map">
update sys_user set point=#{point}
<where>
--
Gitblit v1.9.2