From 798aa9213a565c6c5ffb411e3cef40a10f99e9d1 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期五, 31 三月 2023 09:16:53 +0800
Subject: [PATCH] 新疆绿色智能综合研究所补充

---
 src/main/java/com/nanometer/smartlab/dao/SysUserDao.xml |   84 +++++++++++++++++++++++++++++++++++++++---
 1 files changed, 78 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/dao/SysUserDao.xml b/src/main/java/com/nanometer/smartlab/dao/SysUserDao.xml
index d4b7cac..1c0d0ef 100644
--- a/src/main/java/com/nanometer/smartlab/dao/SysUserDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/SysUserDao.xml
@@ -23,6 +23,8 @@
     <result property="roleName" column="roleName"></result>
     <result property="containerCodeList" column="containerCodeList"></result>
     <result property="project" column="project"></result>
+    <result property="url" column="url"></result>
+    <result property="score" column="score"></result>
     <result property="waster" column="waster" typeHandler="com.nanometer.smartlab.entity.handler.WasterHandler"></result>
   </resultMap>
 
@@ -121,7 +123,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">
@@ -144,7 +148,16 @@
     select DISTINCT su.*, br.name as roleName from sys_user as su
     left join base_role as br on su.role_id = br.id inner join sys_project as sp on su.id=sp.sys_user_id
     where su.valid_flag = 1
-    <include refid="queryWhereSql"/>
+      <if test="department != null and department != ''">
+          and su.department = #{department}
+      </if>
+      <if test="approverFlag != null">
+          and su.approver_flag = #{approverFlag}
+      </if>
+      <if test="project != null and project != ''">
+          and (su.project like concat('%',#{project},'%')
+          or su.project is null or su.project = '')
+      </if>
     order by su.arp ASC
     <if test="first != null and pageSize != null">
       limit #{first}, #{pageSize}
@@ -152,7 +165,9 @@
   </select>
 
   <select id="getSysUserInfoList" parameterType="java.util.Map" resultMap="SysUser">
-    select u.name,u.see_flag,u.role_id,u.valid_flag,u.id_card,u.point,group_concat(container_code SEPARATOR ',') containerCodeList ,u.arp, bm1.meta_value department,bm2.meta_value company,u.project_id projectId from sys_user u
+    select u.name,u.see_flag,u.role_id,u.valid_flag,u.id_card,u.point,group_concat(container_code SEPARATOR ',') containerCodeList ,u.arp, bm1.meta_value department,bm2.meta_value company,u.project_id projectId,
+    u.url,u.score
+    from sys_user u
     left join sys_laboratory l on l.department = u.department and l.valid_flag = 1
     left join sys_laboratory_container c on c.laboratory_id = l.id and c.valid_flag = 1
     left join base_meta bm1 on bm1.id = u.department
@@ -173,13 +188,15 @@
   </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,waster)
-    values (#{id}, #{arp}, #{account}, #{password}, #{company}, #{department}, #{name}, #{phone}, #{email}, #{memo}, #{idCard}, #{approverFlag}, #{seeFlag}, #{roleId}, 1, now(), now(),#{project},#{waster})
+    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,url,score)
+    values (#{id}, #{arp}, #{account}, #{password}, #{company}, #{department}, #{name}, #{phone}, #{email}, #{memo}, #{idCard}, #{approverFlag}, #{seeFlag}, #{roleId}, 1, now(), now(),#{project},#{waster},#{url},#{score})
   </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=#{project},waster=#{waster}
+    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},
+    url= #{url},
+    score = #{score}
     where id=#{id}
   </update>
 
@@ -334,6 +351,61 @@
             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