edit BI Device log and planList

Fancy

2024-12-19 3c61c5f4bc92f75b4fe60653eaa676a21cde4325

 pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml

@@ -11,7 +11,7 @@
    <result column="supper_admin" property="supperAdmin" />
    <result column="disabled" property="disabled" typeHandler="com.dy.common.mybatis.BooleanTypeHandler" />
    <result column="deleted" property="deleted" typeHandler="com.dy.common.mybatis.BooleanTypeHandler" />
    <result column="dt" property="dt" />
    <result column="create_dt" property="dt" />
  </resultMap>
  <resultMap id="partResultMap" type="com.dy.pmsGlobal.pojoBa.BaUser">
    <!--@mbg.generated-->
@@ -21,6 +21,7 @@
    <result property="phone" column="phone"/>
    <result property="password" column="password"/>
    <result property="disabled" column="disabled" typeHandler="com.dy.common.mybatis.BooleanTypeHandler" />
    <result column="create_dt" property="dt" />
  </resultMap>
  <resultMap id="oneResultMap" type="com.dy.pmsGlobal.pojoBa.BaUser" extends="BaseResultMap">
    <collection property="roles" fetchType="eager" column="{userId=id}" select="com.dy.pmsGlobal.daoBa.BaRoleMapper.selectByUserId" />
@@ -37,20 +38,44 @@

  <sql id="Base_Column_List">
    <!--@mbg.generated-->
    id, `name`, phone, `password`, supper_admin, disabled, deleted,dt
    id, `name`, phone, `password`, supper_admin, disabled, deleted, create_dt
  </sql>
  <sql id="part_Column_List">
    ${alias}.id, ${alias}.name, ${alias}.phone, ${alias}.password, ${alias}.disabled,${alias}.dt
  </sql>
<!--  <sql id="part_Column_List"><![CDATA[-->
<!--    ${alias}.id, ${alias}.name, ${alias}.phone, ${alias}.password, ${alias}.disabled,${alias}.create_dt-->
<!--  ]]></sql>-->
  <sql id="Login_Column_List">
    id, name, phone, supper_admin
  </sql>

  <select id="selectNameByUserId" parameterType="java.lang.Long" resultType="java.lang.String">
    select name from ba_user where id=#{id}
  </select>

  <select id="selectNameById" parameterType="java.lang.Long" resultType="java.lang.String">
    select name from ba_user where id=#{id}
  </select>

  <select id="selectByAssistants" resultMap="BaseResultMap">
    SELECT
    *
    FROM
    ba_user
    WHERE
    id IN (
    SELECT
    SUBSTRING_INDEX( SUBSTRING_INDEX( #{assistants,jdbcType=VARCHAR}, ',', help_topic_id + 1 ), ',',- 1 ) AS num
    FROM
    mysql.help_topic
    WHERE
    help_topic_id <![CDATA[ < ]]> LENGTH( #{assistants,jdbcType=VARCHAR} )- LENGTH(
    REPLACE ( #{assistants,jdbcType=VARCHAR}, ',', '' ))+ 1
    )
  </select>

  <select id="selectCount" resultType="java.lang.Long">
    select
      count(*)
    from ba_user
    where supper_admin!=1 and deleted!=1
  </select>
  <select id="login" resultMap="loginResultMap" >
    select
@@ -59,40 +84,26 @@
    where disabled!=1 and deleted!=1 and phone=#{phone} and password=#{password}
  </select>

  <select id="getUserList" resultMap="loginResultMap" >
    select
    <include refid="Login_Column_List" />
    from ba_user
    where disabled!=1 and deleted!=1
  </select>

  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="oneResultMap">
    <!--@mbg.generated-->
    select 
    <include refid="Base_Column_List" />
    from ba_user
    where id = #{id}
    where id = #{id} and deleted!=1
  </select>


  <select id="selectSomeCount" parameterType="java.util.Map" resultType="java.lang.Long">
    select
    count(*)
    from ba_user bu
    inner join ba_user_role ur on ur.user_id=bu.id
    where bu.supper_admin!=1 and bu.deleted!=1
    <trim prefix="and" suffixOverrides="and">
      <if test="name != null and name != ''">
        bu.name like concat('%', #{name}, '%') and
      </if>
      <if test="phone != null and phone !=''">
        bu.phone = #{phone,jdbcType=VARCHAR}
      </if>
      <if test="roleId != null">
        ur.role_id=#{roleId,jdbcType=BIGINT}
      </if>
    </trim>
  </select>
  <select id="selectSome" parameterType="java.util.Map" resultMap="someResultMap">
    select
    <include refid="part_Column_List" >
      <property name="alias" value="bu"/>
    </include>
    from ba_user bu
    inner join ba_user_role ur on ur.user_id=bu.id
#     left join ba_user_role ur on ur.user_id=bu.id
    where bu.supper_admin!=1 and bu.deleted!=1
    <trim prefix="and" suffixOverrides="and">
      <if test="name != null and name != ''">
@@ -101,9 +112,30 @@
      <if test="phone != null and phone !=''">
        bu.phone = #{phone,jdbcType=VARCHAR} and
      </if>
      <if test="roleId != null">
        ur.role_id=#{roleId,jdbcType=BIGINT} and
<!--      <if test="roleId != null and roleId !=''">-->
<!--        ur.role_id=#{roleId,jdbcType=BIGINT} and-->
<!--      </if>-->
      <if test="disabled != null">
        bu.disabled=#{disabled,jdbcType=BOOLEAN}
      </if>
    </trim>
  </select>
  <select id="selectSome" parameterType="java.util.Map" resultMap="someResultMap">
    select
    <include refid="Base_Column_List"/>
    from ba_user bu
#     left join ba_user_role ur on ur.user_id=bu.id
    where bu.supper_admin!=1 and bu.deleted!=1
    <trim prefix="and" suffixOverrides="and">
      <if test="name != null and name != ''">
        bu.name like concat('%', #{name}, '%') and
      </if>
      <if test="phone != null and phone !=''">
        bu.phone = #{phone,jdbcType=VARCHAR} and
      </if>
<!--      <if test="roleId != null and roleId !=''">-->
<!--        ur.role_id=#{roleId,jdbcType=BIGINT} and-->
<!--      </if>-->
      <if test="disabled != null">
        bu.disabled=#{disabled,jdbcType=BOOLEAN}
      </if>
@@ -115,7 +147,14 @@
      </if>
    </trim>
  </select>

  <select id="selectNamesByAssistants" parameterType="java.lang.String" resultType="java.lang.String">
    SELECT GROUP_CONCAT(name) AS assistantNames FROM ba_user WHERE id IN
    <if test="assistants != null and assistants !=''">
      <foreach collection="assistants.split(',')" item="item" separator="," open="(" close=")">
        #{item,jdbcType=BIGINT}
      </foreach>
    </if>
  </select>

  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
    <!--@mbg.generated-->
@@ -141,16 +180,16 @@
      <if test="id != null">
        id,
      </if>
      <if test="name != null">
      <if test="name != null and name !=''">
        `name`,
      </if>
      <if test="phone != null">
      <if test="phone!= null and phone !=''">
        phone,
      </if>
      <if test="password != null">
      <if test="password!= null and password !=''">
        `password`,
      </if>
      <if test="supperAdmin != null">
      <if test="supperAdmin!= null">
        supper_admin,
      </if>
      <if test="disabled != null">
@@ -164,16 +203,16 @@
      <if test="id != null">
        #{id},
      </if>
      <if test="name != null">
      <if test="name != null and name !=''">
        #{name},
      </if>
      <if test="phone != null">
      <if test="phone!= null and phone !=''">
        #{phone},
      </if>
      <if test="password != null">
      <if test="password!= null and password !=''">
        #{password},
      </if>
      <if test="supperAdmin != null">
      <if test="supperAdmin!= null">
        #{supperAdmin},
      </if>
      <if test="disabled != null">
@@ -188,16 +227,16 @@
    <!--@mbg.generated-->
    update ba_user
    <set>
      <if test="name != null">
      <if test="name != null and name !=''">
        `name` = #{name},
      </if>
      <if test="phone != null">
      <if test="phone!= null and phone !=''">
        phone = #{phone},
      </if>
      <if test="password != null">
      <if test="password!= null and password !=''">
        `password` = #{password},
      </if>
      <if test="supperAdmin != null">
      <if test="supperAdmin!= null">
        supper_admin = #{supperAdmin},
      </if>
      <if test="disabled != null">