From 42155cb925930831293dd10ac5037c04619e92c9 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 17 十月 2024 16:05:08 +0800
Subject: [PATCH] 修改通信中间件上行数据的漏损量处理逻辑，对于当天绑定（发现并绑定）的控制器，控制器计算的漏损量一定不正确，强制设置成0，本次修改是把原实现用发现日期时间控制，变成绑定日期时间控制。
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 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 dcb0b69..b8f7e0d 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml
@@ -276,8 +276,8 @@
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
@@ -310,8 +310,8 @@
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
@@ -366,4 +366,18 @@
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>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0