From a3cfd941f3ccb05906ecbe99e6993f96770b51ed Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 10 七月 2025 10:43:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementSendMapper.xml | 55 +++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 45 insertions(+), 10 deletions(-)
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementSendMapper.xml b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementSendMapper.xml
index 9925f50..da34614 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementSendMapper.xml
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementSendMapper.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.system.mapper.SysAnnouncementSendMapper">
-
+
<resultMap id="AnnouncementSendModel" type="org.jeecg.modules.system.model.AnnouncementSendModel" >
<result column="id" property="id" jdbcType="VARCHAR"/>
<result column="annt_id" property="anntId" jdbcType="VARCHAR"/>
@@ -17,12 +17,12 @@
<result column="open_type" property="openType" jdbcType="VARCHAR"/>
<result column="open_page" property="openPage" jdbcType="VARCHAR"/>
</resultMap>
-
+
<select id="queryByUserId" parameterType="String" resultType="String">
- select sas.annt_id from sys_announcement_send sas
+ select sas.annt_id from sys_announcement_send sas
where sas.user_id = #{userId}
</select>
-
+
<select id="getMyAnnouncementSendList" parameterType="Object" resultMap="AnnouncementSendModel">
select
sas.id,
@@ -60,9 +60,13 @@
<if test="announcementSendModel.bizSource !=null and announcementSendModel.bizSource =='isNoBpm'">
and (sa.bus_type != 'bpm' or sa.bus_type is null)
</if>
- <if test="announcementSendModel.msgCategory !=null and announcementSendModel.msgCategory != ''">
- and sa.msg_category = #{announcementSendModel.msgCategory}
- </if>
+ <if test="announcementSendModel.msgCategoryList.size != 0">
+ and sa.msg_category in (
+ <foreach item="msgCategory" collection="announcementSendModel.msgCategoryList" separator=",">
+ #{msgCategory}
+ </foreach>
+ )
+ </if>
order by sas.read_flag,sa.send_time desc
</select>
@@ -96,12 +100,43 @@
<!-- 淇敼涓哄凡璇绘秷鎭� -->
<update id="updateReaded">
update sys_announcement_send set read_flag = '1'
- where user_id = #{userId}
+ where user_id = #{userId}
and annt_id in
<foreach collection="annoceIdList" index="index" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</update>
-
+ <select id="getPrimaryInfo" resultType="org.jeecg.modules.system.entity.SysAnnouncementSend">
+ select
+ t1.id id,
+ t1.annt_id anntId,
+ t1.user_id userId,
+ t1.read_flag readFlag,
+ t2.msg_content msgContent,
+ t2.msg_category msgCategory
+ from
+ sys_announcement_send t1
+ left join sys_announcement t2
+ on t1.annt_id = t2.id
+ where t1.read_flag = '0'
+ and t1.user_id = #{userId}
+ <if test="msgCategoryList.size != 0">
+ and t2.msg_category in (
+ <foreach item="msgCategory" collection="msgCategoryList" separator=",">
+ #{msgCategory}
+ </foreach>
+ )
+ </if>
+ </select>
-</mapper>
\ No newline at end of file
+ <select id="findLastMessage" resultType="org.jeecg.modules.system.entity.SysAnnouncement">
+ SELECT TOP 1 * FROM sys_announcement WHERE msg_content = #{messageContent} ORDER BY create_time DESC;
+ </select>
+ <select id="getMessageType" resultType="java.lang.String">
+ SELECT DISTINCT
+ msg_category
+ FROM
+ sys_announcement
+ </select>
+
+</mapper>
--
Gitblit v1.9.3