From 6dacac48ebb596797dfd8e5bf3a803ed0b583643 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 05 二月 2025 17:11:31 +0800
Subject: [PATCH] 取水口综合信息-统计数据逻辑处理模块完善
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml | 119 +++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 91 insertions(+), 28 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml
index 9cc43ba..0e5f33e 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml
@@ -13,8 +13,10 @@
<result property="password" column="password"/>
<result property="orgTag" column="orgTag"/>
<result property="supperAdmin" column="supperAdmin"/>
- <result property="disabled" column="disabled" typeHandler="com.dy.common.mybatis.envm.EnumCodeTypeHandler" javaType="com.dy.common.mybatis.envm.Disabled"/>
- <result property="deleted" column="deleted" typeHandler="com.dy.common.mybatis.envm.EnumCodeTypeHandler" javaType="com.dy.common.mybatis.envm.Deleted"/>
+ <result property="disabled" column="disabled" typeHandler="com.dy.common.mybatis.envm.EnumCodeTypeHandler"
+ javaType="com.dy.common.mybatis.envm.Disabled"/>
+ <result property="deleted" column="deleted" typeHandler="com.dy.common.mybatis.envm.EnumCodeTypeHandler"
+ javaType="com.dy.common.mybatis.envm.Deleted"/>
</resultMap>
<resultMap id="partResultMap" type="com.dy.pipIrrGlobal.pojoBa.BaUser">
@@ -46,7 +48,7 @@
</sql>
<sql id="part_Column_List">
- ${alias}.id, ${alias}.name, ${alias}.phone, ${alias}.disabled
+ #{alias}.id, #{alias}.name, #{alias}.phone, #{alias}.disabled
</sql>
<sql id="Login_Column_List">
@@ -99,7 +101,8 @@
</trim>
</select>
<insert id="putin" parameterType="com.dy.pipIrrGlobal.pojoBa.BaUser">
- insert into ba_user (<include refid="Base_Column_List" />)
+<!-- insert into ba_user (<include refid="Base_Column_List" />)-->
+ insert into ba_user(id, blockId, name, phone, password, orgTag, supperAdmin, disabled, deleted)
values (#{id,jdbcType=BIGINT},
#{blockId,jdbcType=BIGINT},
#{userName,jdbcType=VARCHAR},
@@ -195,7 +198,7 @@
deleted = #{deleted,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT},
</if>
</set>
- where id = #{id,jdbcType=BIGINT}
+ where id = #{id, jdbcType=BIGINT}
</update>
<update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoBa.BaUser">
update ba_user
@@ -237,7 +240,7 @@
INNER JOIN ba_role_permissions per ON per.roleId = rol.id
<where>
<if test = "userId != null and userId > 0">
- AND user.id = ${userId}
+ AND user.id = #{userId}
</if>
</where>
</select>
@@ -245,14 +248,18 @@
<!--鏍规嵁鐢ㄦ埛缂栧彿鑾峰彇鐢ㄦ埛淇℃伅-->
<select id="getUserInfoById" resultType="java.util.Map">
SELECT
- id AS userId,
- name AS userName
- FROM ba_user
+ us.id AS userId,
+ us.name AS userName,
+ us.phone,
+ IFNULL(us.blockId, 0) AS blockId,
+ IFNULL(blo.name, 0) AS blockName
+ FROM ba_user us
+ LEFT JOIN ba_block blo ON us.blockId = blo.id
<where>
- AND disabled = 0
- AND deleted = 0
+ AND us.disabled = 0
+ AND us.deleted = 0
<if test = "userId != null and userId > 0">
- AND ba_user.id = ${userId}
+ AND us.id = #{userId}
</if>
</where>
</select>
@@ -261,14 +268,27 @@
<select id="getRecordCount" parameterType="java.util.Map" resultType="java.lang.Long">
SELECT
COUNT(*) AS recordCount
+ FROM
+ (
+ SELECT
+ CAST(id AS char) AS id,
+ phone,
+ name AS userName,
+ disabled AS stateId,
+ (CASE
+ WHEN disabled = 0 THEN '姝ｅ父'
+ WHEN disabled = 1 THEN '宸茬鐢�'
+ END) AS stateName,
+ CAST(blockId AS char) AS blockId,
+ (SELECT name FROM ba_block WHERE id = user.blockId) AS blockName
FROM ba_user user
- INNER JOIN ba_user_role usro ON usro.userId = user.id
+ LEFT JOIN ba_user_role usro ON usro.userId = user.id
<where>
AND user.supperAdmin != 1
AND user.deleted = 0
- <if test = "name != null and name !=''">
- AND user.name like CONCAT('%',#{name},'%')
+ <if test = "userName != null and userName !=''">
+ AND user.name like CONCAT('%',#{userName},'%')
</if>
<if test = "phone != null and phone !=''">
@@ -276,32 +296,33 @@
</if>
<if test = "roleId != null and roleId > 0">
- AND usro.roleId = ${roleId}
+ AND usro.roleId = #{roleId}
</if>
</where>
+ GROUP BY user.id) c
</select>
<!--鏍规嵁鎸囧畾鏉′欢鑾峰彇鐢ㄦ埛鍒楄〃-->
<select id="getUsers" resultType="com.dy.pipIrrGlobal.voBa.VoUserInfo">
SELECT
- CAST(id AS char) AS userId,
+ CAST(id AS char) AS id,
phone,
name AS userName,
disabled AS stateId,
(CASE
- WHEN disabled = 0 THEN "姝ｅ父"
- WHEN disabled = 1 THEN "宸茬鐢�"
+ WHEN disabled = 0 THEN '姝ｅ父'
+ WHEN disabled = 1 THEN '宸茬鐢�'
END) AS stateName,
CAST(blockId AS char) AS blockId,
(SELECT name FROM ba_block WHERE id = user.blockId) AS blockName
FROM ba_user user
- INNER JOIN ba_user_role usro ON usro.userId = user.id
+ LEFT JOIN ba_user_role usro ON usro.userId = user.id
<where>
AND user.supperAdmin != 1
AND user.deleted = 0
- <if test = "name != null and name !=''">
- AND user.name like CONCAT('%',#{name},'%')
+ <if test = "userName != null and userName !=''">
+ AND user.name like CONCAT('%',#{userName},'%')
</if>
<if test = "phone != null and phone !=''">
@@ -309,13 +330,16 @@
</if>
<if test = "roleId != null and roleId > 0">
- AND usro.roleId = ${roleId}
+ AND usro.roleId = #{roleId}
</if>
</where>
+ GROUP BY user.id
ORDER BY user.id DESC
- <if test="pageCurr != null and pageSize != null">
- LIMIT ${pageCurr}, ${pageSize}
- </if>
+ <trim prefix="limit " >
+ <if test="start != null and count != null">
+ #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
+ </if>
+ </trim>
</select>
<!--鏍规嵁鐢ㄦ埛缂栧彿鑾峰彇瑙掕壊ID鍒楄〃-->
@@ -323,7 +347,7 @@
SELECT
roleId
FROM ba_user_role
- WHERE userId = ${userId}
+ WHERE userId = #{userId}
</select>
<select id="getRoleNamesByUserId" resultType="java.util.HashMap">
@@ -331,7 +355,46 @@
ro.name AS roleName
FROM ba_user_role usro
INNER JOIN ba_role ro ON usro.roleId = ro.id
- WHERE userId = ${userId}
+ WHERE userId = #{userId}
</select>
+
+ <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+ <!--@mbg.generated-->
+ select
+ <include refid="Base_Column_List" />
+ from ba_user
+ where id = #{id,jdbcType=BIGINT}
+ </select>
+
+ <select id="getPhones" resultType="java.lang.String">
+ SELECT phone FROM ba_user WHERE deleted = 0 and disabled = 0
+ </select>
+
+ <!--鑾峰彇绠�鍗曠敤鎴锋暟鎹垪琛�-->
+ <select id="getSimpleUsers" resultType="com.dy.pipIrrGlobal.voBa.VoSimpleUser">
+ SELECT
+ id AS userId,
+ name AS userName
+ FROM ba_user
+ WHERE disabled = 0 AND deleted = 0
+ </select>
+
+ <!--鑾峰彇宸℃鍛樺垪琛�-->
+ <select id="getInspectors" resultType="com.dy.pipIrrGlobal.voBa.VoRoleSimple">
+ SELECT
+ us.id AS inspectorId,
+ us.name AS inspector
+ FROM ba_user us
+ INNER JOIN ba_user_role ur ON ur.userId = us.id
+ INNER JOIN ba_role rol ON rol.id = ur.roleId
+ <where>
+ AND us.disabled = 0
+ AND us.deleted = 0
+ AND rol.`name` = '宸℃鍛�'
+ <if test = "inspector != null and inspector !=''">
+ AND us.name LIKE CONCAT('%',#{inspector},'%')
+ </if>
+ </where>
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0