From 6e2d9a0079b1f9935605ce422a6ad77c65e780fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B7=B4=E6=8B=89=E8=BF=AA=E7=BB=B4?= <barat@csxjy.com.cn>
Date: Wed, 8 Sep 2021 18:05:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E8=8E=B7=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E9=80=9A=E7=9F=A5=E7=9A=84=20list=20=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../notification/model/dao/entity/SysNotification.java     | 7 +++++++
 .../model/dao/entity/vo/ReceiverNotificationListVo.java    | 1 +
 .../mapper/notification/SysNotificationMapper.xml          | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/model/src/main/java/cn/org/gitlink/notification/model/dao/entity/SysNotification.java b/model/src/main/java/cn/org/gitlink/notification/model/dao/entity/SysNotification.java
index b32b4b5..d59fbc1 100644
--- a/model/src/main/java/cn/org/gitlink/notification/model/dao/entity/SysNotification.java
+++ b/model/src/main/java/cn/org/gitlink/notification/model/dao/entity/SysNotification.java
@@ -2,6 +2,9 @@ package cn.org.gitlink.notification.model.dao.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.util.Date;
 
@@ -15,14 +18,18 @@ public class SysNotification {
 
     private String content;
 
+    @JsonProperty("notification_url")
     private String notificationUrl;
 
+    @JsonProperty("created_at")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:dd:ss")
     private Date createdAt;
 
     private Integer status;
 
     private Integer type;
 
+    @JsonIgnore
     private Integer isDelete;
 
     public Integer getId() {
diff --git a/model/src/main/java/cn/org/gitlink/notification/model/dao/entity/vo/ReceiverNotificationListVo.java b/model/src/main/java/cn/org/gitlink/notification/model/dao/entity/vo/ReceiverNotificationListVo.java
index 26ac206..8b1eee0 100644
--- a/model/src/main/java/cn/org/gitlink/notification/model/dao/entity/vo/ReceiverNotificationListVo.java
+++ b/model/src/main/java/cn/org/gitlink/notification/model/dao/entity/vo/ReceiverNotificationListVo.java
@@ -17,6 +17,7 @@ public class ReceiverNotificationListVo {
     @JsonProperty("unread_atme")
     private Integer unreadAtMeCount;
 
+    @JsonProperty("notification_list")
     private List<SysNotification> list;
 
     public ReceiverNotificationListVo() {
diff --git a/model/src/main/resources/mapper/notification/SysNotificationMapper.xml b/model/src/main/resources/mapper/notification/SysNotificationMapper.xml
index d6aea61..31c6c39 100644
--- a/model/src/main/resources/mapper/notification/SysNotificationMapper.xml
+++ b/model/src/main/resources/mapper/notification/SysNotificationMapper.xml
@@ -151,7 +151,7 @@
     </select>
     <select id="getUnreadSysNotificationsList" resultMap="BaseResultMap">
     select * FROM ${platform}_sys_notification
-	where receiver = #{receiver} AND status = #{status} AND `type` = #{type} AND is_delete = 1
+	where receiver = #{receiver} AND status = #{status} AND `type` = #{type} AND is_delete = -1
 	ORDER BY id DESC limit #{notificationNumber}
     </select>
     <select id="getSysNotificationPageList" parameterType="cn.org.gitlink.notification.model.dao.entity.SysNotification" resultMap="BaseResultMap">