From d08ecb8b070387b8e08d0b0bde751bd7eb44c661 Mon Sep 17 00:00:00 2001
From: liangqitao <12345678>
Date: Mon, 20 Dec 2021 16:24:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E5=91=98=E5=90=8C=E6=AD=A5=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PayWorkingGroupServiceImpl.java  |  2 +-
 .../modules/system/entity/SysAnnouncement.java    |  4 ++++
 .../mapper/xml/SysAnnouncementSendMapper.xml      |  4 +++-
 .../system/model/AnnouncementSendModel.java       | 15 ++++++++-------
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java
index 9821e66c..3d3f577d 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java
@@ -160,7 +160,7 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl<PayWorkingGroupMappe
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
+    @Transactional(rollbackFor = JeroBootException.class)
     public void copy(PayWorkingGroup payWorkingGroup) {
         // 更新工作组
         PayWorkingGroup payWorkingGroupOld = payWorkingGroupService.getById(payWorkingGroup.getId());
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 039c4fed..65678b78 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
@@ -154,4 +154,8 @@ public class SysAnnouncement implements Serializable {
      */
     @TableField(exist = false)
     private String phone;
+    /**
+     * 跳转参数
+     */
+    private String jumpParameter;
 }
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 23a58988..d0e4b4ff 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
@@ -15,6 +15,7 @@
 		<result column="bus_id" property="busId" jdbcType="VARCHAR"/>
 		<result column="open_type" property="openType" jdbcType="VARCHAR"/>
 		<result column="open_page" property="openPage" jdbcType="VARCHAR"/>
+		<result column="jump_parameter" property="jumpParameter" jdbcType="VARCHAR"/>
 	</resultMap>
 	
 	<select id="queryByUserId" parameterType="String"  resultType="String">
@@ -38,7 +39,8 @@
 			sa.open_type as open_type,
 			sa.open_page as open_page,
 			sa.msg_abstract,
-			sa.template_code
+			sa.template_code,
+			sa.jump_parameter
 	   from sys_announcement_send sas
 	   left join sys_announcement sa ON sas.annt_id = sa.id
 	   where sa.send_status = '1'
diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/model/AnnouncementSendModel.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/model/AnnouncementSendModel.java
index 1b4f5be0..841fd7ce 100644
--- a/jero-boot-module-system/src/main/java/com/jero/modules/system/model/AnnouncementSendModel.java
+++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/model/AnnouncementSendModel.java
@@ -1,16 +1,13 @@
 package com.jero.modules.system.model;
 
-import java.io.Serializable;
-
-import com.jero.common.aspect.annotation.Dict;
-import org.springframework.format.annotation.DateTimeFormat;
-
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
-
+import com.jero.common.aspect.annotation.Dict;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
 
 /**
  * @Description: 用户通告阅读标记表
@@ -91,4 +88,8 @@ public class AnnouncementSendModel implements Serializable {
 	 * 结束时间
 	 */
 	private String endTime;
+	/**
+	 * 跳转参数
+	 */
+	private String jumpParameter;
 }