From 78540a0416c6c91229d6535039edeca233e9f58f Mon Sep 17 00:00:00 2001
From: zhuangtianxiang <2913129173@qq.com>
Date: Wed, 26 Mar 2025 20:56:56 +0800
Subject: [PATCH] =?UTF-8?q?feat(message):=20=E6=B7=BB=E5=8A=A0=E5=85=AC?=
 =?UTF-8?q?=E5=91=8A=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=B9=B6=E4=BF=AE=E5=A4=8D=E6=9C=AA=E8=AF=BB=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E8=AE=A1=E6=95=B0=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 AdminNoticeVo 中添加 createTime 字段，用于显示公告创建时间
- 在 UserNoticeMapper.xml 中添加 createTime 的 MyBatis映射
- 修复 UserNoticeServiceImpl 中 countUnread 方法的逻辑错误，改为正确计算未读消息数量
---
 .../modules/message/service/impl/UserNoticeServiceImpl.java | 2 +-
 .../zsc/edu/gateway/modules/message/vo/AdminNoticeVo.java   | 6 ++++++
 src/main/resources/mappers/notice/UserNoticeMapper.xml      | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/zsc/edu/gateway/modules/message/service/impl/UserNoticeServiceImpl.java b/src/main/java/com/zsc/edu/gateway/modules/message/service/impl/UserNoticeServiceImpl.java
index 0a96dad..5556910 100644
--- a/src/main/java/com/zsc/edu/gateway/modules/message/service/impl/UserNoticeServiceImpl.java
+++ b/src/main/java/com/zsc/edu/gateway/modules/message/service/impl/UserNoticeServiceImpl.java
@@ -86,7 +86,7 @@ public class UserNoticeServiceImpl extends ServiceImpl<UserNoticeRepository, Use
     public Integer countUnread(UserDetailsImpl userDetails) {
         LambdaQueryWrapper<UserNotice> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.eq(UserNotice::getUserId, userDetails.getId())
-                .eq(UserNotice::getIsRead, true);
+                .eq(UserNotice::getIsRead, false);
         return Math.toIntExact(baseMapper.selectCount(lambdaQueryWrapper));
     }
 
diff --git a/src/main/java/com/zsc/edu/gateway/modules/message/vo/AdminNoticeVo.java b/src/main/java/com/zsc/edu/gateway/modules/message/vo/AdminNoticeVo.java
index c6d107e..1c8f1bd 100644
--- a/src/main/java/com/zsc/edu/gateway/modules/message/vo/AdminNoticeVo.java
+++ b/src/main/java/com/zsc/edu/gateway/modules/message/vo/AdminNoticeVo.java
@@ -3,6 +3,8 @@ package com.zsc.edu.gateway.modules.message.vo;
 import com.zsc.edu.gateway.modules.message.entity.NoticeType;
 import lombok.Data;
 
+import java.time.LocalDateTime;
+
 /**
  * @author zhuang
  */
@@ -48,6 +50,10 @@ public class AdminNoticeVo {
      * 内容
      */
     public String content;
+    /**
+     * 创建时间
+     */
+    public LocalDateTime createTime;
     /**
      * 备注
      */
diff --git a/src/main/resources/mappers/notice/UserNoticeMapper.xml b/src/main/resources/mappers/notice/UserNoticeMapper.xml
index a8e00fe..78adf43 100644
--- a/src/main/resources/mappers/notice/UserNoticeMapper.xml
+++ b/src/main/resources/mappers/notice/UserNoticeMapper.xml
@@ -33,6 +33,7 @@
         <result column="content" jdbcType="VARCHAR" property="content"/>
         <result column="remark" jdbcType="VARCHAR" property="remark"/>
         <result column="user_count" jdbcType="INTEGER" property="userCount"/>
+        <result column="create_time" jdbcType="DATE" property="createTime"/>
         <result column="read_count" jdbcType="INTEGER" property="readCount"/>
     </resultMap>
     <select id="selectByNoticeIdAndUserId" resultType="com.zsc.edu.gateway.modules.message.vo.UserNoticeVo"