From 69581303043e31ace9f68f0b97cf3a5299611dc6 Mon Sep 17 00:00:00 2001 From: liao Date: Thu, 13 Jul 2023 17:29:38 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=B9=B3=E5=8F=B0=E5=8F=91=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E5=8A=9F=E8=83=BD=E4=B8=8A=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/23年7月变更.sql | 2 +- .../jero/system/controller/SystemSendMessageController.java | 2 +- .../com/jero/modules/system/entity/SysAnnouncement.java | 6 ++++++ .../com/jero/modules/system/entity/SysAnnouncementSend.java | 5 ----- .../modules/system/mapper/xml/SysAnnouncementSendMapper.xml | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/db/23年7月变更.sql b/db/23年7月变更.sql index 3bc78639..14e5f1ce 100644 --- a/db/23年7月变更.sql +++ b/db/23年7月变更.sql @@ -18,5 +18,5 @@ create table pay_meeting_guests_file alter table pay_meeting_guests_file add primary key (id); -ALTER TABLE sys_announcement_send ADD deadline datetime COMMENT '截止时间'; +ALTER TABLE sys_announcement ADD deadline datetime COMMENT '截止时间'; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/system/controller/SystemSendMessageController.java b/jero-boot-incoming-payment/src/main/java/com/jero/system/controller/SystemSendMessageController.java index 894cca36..170f988a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/system/controller/SystemSendMessageController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/system/controller/SystemSendMessageController.java @@ -95,6 +95,7 @@ public class SystemSendMessageController { announcement.setSendTime(new Date()); announcement.setMsgCategory(CommonConstant.MSG_CATEGORY_2); announcement.setDelFlag(String.valueOf(CommonConstant.DEL_FLAG_0)); + announcement.setDeadline(deadline); // 截止时间 sysAnnouncementService.save(announcement); listPayContactsManagement.parallelStream().forEach(p->{ try { @@ -120,7 +121,6 @@ public class SystemSendMessageController { announcementSend.setAnntId(anntId); announcementSend.setUserId(user.getId()); announcementSend.setReadFlag(CommonConstant.NO_READ_FLAG); - announcementSend.setDeadline(deadline); // 截止时间 sysAnnouncementSendService.save(announcementSend); JSONObject obj = new JSONObject(); obj.put(WebsocketConst.MSG_CMD, WebsocketConst.CMD_USER); diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysAnnouncement.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysAnnouncement.java index 65678b78..79e7db40 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysAnnouncement.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysAnnouncement.java @@ -11,6 +11,7 @@ import org.jeecgframework.poi.excel.annotation.Excel; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; +import java.util.Date; /** * @Description: 系统通告表 @@ -158,4 +159,9 @@ public class SysAnnouncement implements Serializable { * 跳转参数 */ private String jumpParameter; + + /**截止时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private java.util.Date deadline; } diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysAnnouncementSend.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysAnnouncementSend.java index 99da0121..36c32a32 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysAnnouncementSend.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysAnnouncementSend.java @@ -45,9 +45,4 @@ public class SysAnnouncementSend implements Serializable { @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private java.util.Date updateTime; - - /**截止时间*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - private java.util.Date deadline; } diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysAnnouncementSendMapper.xml b/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysAnnouncementSendMapper.xml index 96a7381b..ba6ca002 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysAnnouncementSendMapper.xml +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysAnnouncementSendMapper.xml @@ -47,7 +47,7 @@ and sa.del_flag = '0' and sas.user_id = #{announcementSendModel.userId} - and sas.deadline <= #{announcementSendModel.deadline} + and sa.deadline <= #{announcementSendModel.deadline} and sa.titile = #{announcementSendModel.titile}