update 平台发消息功能上线

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 '截止时间';
 

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);

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;
 }

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;
 }

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}
 		<if test="announcementSendModel.deadline != null">
-			and sas.deadline &lt;= #{announcementSendModel.deadline}
+			and sa.deadline &lt;= #{announcementSendModel.deadline}
 		</if>
 		<if test="announcementSendModel.titile !=null and announcementSendModel.titile != ''">
 			and sa.titile = #{announcementSendModel.titile}