修改申购试剂查询

李宇

2021-01-12 fce41585f6c4e09c12c7e2a3150d4dfbf1f46bb0

 src/main/java/com/nanometer/smartlab/dao/SysUserDao.xml

@@ -22,8 +22,25 @@
    <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>
  </resultMap>

    <resultMap id="SysUserDto" type="com.nanometer.smartlab.entity.dto.SysUserDto">
        <id property="id" column="id"/>
        <result property="arp" column="arp"/>
        <result property="account" column="account"/>
        <result property="department" column="department"/>
        <result property="name" column="name"/>
        <result property="point" column="point"/>
        <collection property="sysLaboratory" ofType="com.nanometer.smartlab.entity.dto.SysLaboratoryDto" fetchType="lazy">
            <id property="id" column="sl_id"/>
            <result property="name" column="sl_name"/>
            <collection property="sysLaboratoryContainer" ofType="com.nanometer.smartlab.entity.dto.SysLaboratoryContainerDto" fetchType="lazy">
                <id property="id" column="slc_id"/>
                <result property="name" column="slc_name"/>
            </collection>
        </collection>
    </resultMap>

  <sql id="queryWhereSql">
    <if test="arp != null and arp != ''">
@@ -138,13 +155,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)
    values (#{id}, #{arp}, #{account}, #{password}, #{company}, #{department}, #{name}, #{phone}, #{email}, #{memo}, #{idCard}, #{approverFlag}, #{seeFlag}, #{roleId}, 1, now(), now(),#{project})
  </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}
    where id=#{id}
  </update>

@@ -175,22 +192,51 @@
  </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
   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 project_id = (
   SELECT project_id from sys_laboratory_container
   WHERE container_code =  #{0}
   and  valid_flag = 1)
   AND u.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
   su.id,
   su.arp,
   su.account,
   su.`name`,
   su.point,
   bm1.meta_value department,
   sl.id sl_id,
   sl.`name` sl_name,
   slc.id slc_id,
   slc.`name` slc_name
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}
    </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>

    <update id="updateUserPointBySelective" parameterType="java.util.Map">
        update sys_user set point=#{point}