From 53d4b735a1b0fc86b069c348efb7f254e521a291 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期一, 16 一月 2023 11:45:54 +0800
Subject: [PATCH] fix: 趋势分析高发点位查询和首次报警点位查询
---
ycl-platform/src/main/resources/mapper/message/MessageMapper.xml | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/ycl-platform/src/main/resources/mapper/message/MessageMapper.xml b/ycl-platform/src/main/resources/mapper/message/MessageMapper.xml
index 94cf1ad..8affb6f 100644
--- a/ycl-platform/src/main/resources/mapper/message/MessageMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/message/MessageMapper.xml
@@ -37,7 +37,7 @@
resultType="com.ycl.vo.message.MessageVO">
SELECT
t1.id,
- t2.username as targetFrom,
+ t1.target_from,
t3.column_name as messageTypeName,
t1.`status`,
t1.body,
@@ -45,10 +45,13 @@
t1.create_time,
t1.respond_result,
t1.head,
- t4.username as createUser
+ t1.target_to,
+ t1.message_type,
+ t1.channel_code,
+ t4.username as createUser,
+ t1.phone_number
FROM
`ums_message` t1
- LEFT JOIN ums_admin t2 ON t1.target_from = t2.id
left join ums_admin t4 on t1.create_user = t4.id
LEFT JOIN ums_message_column t3 ON t3.id = t1.message_type
<where>
@@ -58,8 +61,14 @@
<if test="messageParam.channelCode !='' and messageParam.channelCode != null">
and t1.channel_code=#{messageParam.channelCode}
</if>
+ <if test="messageParam.targetTo !='' and messageParam.targetTo != null">
+ and t1.target_to=#{messageParam.targetTo}
+ </if>
<if test="messageParam.messageType != null">
and t1.message_type=#{messageParam.messageType}
+ </if>
+ <if test="messageParam.isView != null">
+ and t1.is_view=#{messageParam.isView}
</if>
<if test="messageParam.startTime != null and messageParam.startTime != '' and messageParam.endTime != null and messageParam.endTime != '' ">
and t1.create_time between #{messageParam.startTime} and #{messageParam.endTime}
@@ -80,4 +89,15 @@
</where>
</select>
+ <select id="selectUserColumn" resultType="com.ycl.vo.message.MessageColumnUserVO">
+ SELECT
+ t1.*,
+ t2.is_receive
+ FROM
+ ums_message_column t1 LEFT JOIN ums_message_column_set t2 ON t1.id = t2.message_column_id
+ WHERE
+ t2.user_id=#{id}
+ and t1.is_show=1
+ </select>
+
</mapper>
--
Gitblit v1.8.0