From df8cf3a5605a1e009c01e1dc8088e49714a27314 Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Fri, 3 Mar 2023 14:25:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/messagelist/MessageListMapper.java      |  1 +
 .../biz/messagelist/MessageListMapper.xml       | 17 +++++++++++++++--
 .../biz/messagelist/MessageListRest.java        |  2 +-
 .../biz/messagelist/MessageListService.java     |  4 ++++
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListMapper.java b/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListMapper.java
index b9283cc..071f940 100644
--- a/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListMapper.java
+++ b/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListMapper.java
@@ -80,6 +80,7 @@ public interface MessageListMapper extends BaseMapper<MessageList> {
     Integer fetchByReceiverSid(String receiverSid);
 
     int selectUnReadCount(@Param("msgTypeSid") String msgTypeSid, @Param("userSid") String userSid);
+    int selectUnReadCount1(@Param("msgTypeSid") String msgTypeSid, @Param("userSid") String userSid);
 
     AppLastMsgVo selectLastMsg(@Param("userSid") String userSid, @Param("msgTypeSid") String msgTypeSid);
 
diff --git a/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListMapper.xml b/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListMapper.xml
index a784edf..82cad24 100644
--- a/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListMapper.xml
+++ b/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListMapper.xml
@@ -165,6 +165,19 @@
             AND mt.sid = #{msgTypeSid}
         </if>
     </select>
+
+    <select id="selectUnReadCount1" resultType="int">
+        SELECT COUNT(1)
+        FROM message_list ml
+        LEFT JOIN message m ON ml.msgSid = m.sid
+        LEFT JOIN message_type mt ON m.msgTypeSid = mt.sid
+        WHERE mt.identifier = '0003'
+        AND ml.state = '0'
+        AND ml.receiverSid = #{userSid}
+        <if test="msgTypeSid != null and msgTypeSid != ''">
+            AND mt.sid = #{msgTypeSid}
+        </if>
+    </select>
     <!--查询最近消息-->
     <select id="selectLastMsg" resultType="com.yxt.messagecenter.api.messagelist.app.AppLastMsgVo">
         SELECT DATE_FORMAT(ml.createTime, '%Y-%m-%d') as sendTime,
@@ -222,11 +235,11 @@
         m.msgTitle,
         m.msgContent,
         ml.state,
-        DATE_FORMAT(ml.createTime, '%Y-%m-%d %H:%i') as sendTime,
+        DATE_FORMAT(ml.createTime, '%Y-%m-%d %H:%m:%s') as sendTime,
         m.msgTargetUri as moduleAction,
         m.senderName,
         m.msgSource,
-        DATE_FORMAT(ml.modifyTime, '%Y-%m-%d %H:%i') as redTime
+        DATE_FORMAT(ml.modifyTime, '%Y-%m-%d %H:%m:%s') as redTime
         FROM message_list ml
         LEFT JOIN message m ON ml.msgSid = m.sid
         <where>
diff --git a/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListRest.java b/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListRest.java
index dba4d58..f3677d8 100644
--- a/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListRest.java
+++ b/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListRest.java
@@ -192,7 +192,7 @@ public class MessageListRest implements MessageListFeign {
 
     @Override
     public ResultBean<Integer> selectUnReadCount(String msgTypeSid, String userSid) {
-        return new ResultBean<Integer>().success().setData(messageListService.selectUnReadCount(msgTypeSid, userSid));
+        return new ResultBean<Integer>().success().setData(messageListService.selectUnReadCount1(msgTypeSid, userSid));
     }
 
     @Override
diff --git a/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListService.java b/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListService.java
index ba96651..ed3de95 100644
--- a/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListService.java
+++ b/message-center-biz/src/main/java/com/yxt/messagecenter/biz/messagelist/MessageListService.java
@@ -250,6 +250,10 @@ public class MessageListService extends MybatisBaseService<MessageListMapper, Me
         return baseMapper.selectUnReadCount(msgTypeSid, userSid);
     }
 
+    public Integer selectUnReadCount1(String msgTypeSid, String userSid) {
+        return baseMapper.selectUnReadCount1(msgTypeSid, userSid);
+    }
+
     /**
      * 手机端查询消息主页面
      *