From 1908fc565324725b710895a35c33f7cc2576b4a5 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Wed, 3 Jun 2020 09:12:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E8=A1=A8=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esua/epdc/activity/result/ActInfoDetailAppResultDTO.java | 4 ++++
 .../esua/epdc/activity/result/ActInfoDetailResultDTO.java    | 5 +++++
 .../esua/epdc/modules/activity/entity/ActInfoEntity.java     | 4 ++++
 .../src/main/resources/mapper/activity/ActInfoDao.xml        | 4 +++-
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActInfoDetailAppResultDTO.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActInfoDetailAppResultDTO.java
index d03cd1f6..8e057e37 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActInfoDetailAppResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActInfoDetailAppResultDTO.java
@@ -224,4 +224,8 @@ public class ActInfoDetailAppResultDTO implements Serializable {
 
 	private String failureReason;
 
+	/**
+	 * 活动新闻稿
+	 */
+	private String actNewsContent;
 }
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActInfoDetailResultDTO.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActInfoDetailResultDTO.java
index 6c65730b..a5bc0959 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActInfoDetailResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActInfoDetailResultDTO.java
@@ -120,4 +120,9 @@ public class ActInfoDetailResultDTO implements Serializable {
 	 * 打卡截止时间
 	 */
 	private Date signinEndTime;
+
+	/**
+	 * 活动新闻稿
+	 */
+	private String actNewsContent;
 }
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActInfoEntity.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActInfoEntity.java
index 874b2cfa..1a19f9f3 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActInfoEntity.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActInfoEntity.java
@@ -201,4 +201,8 @@ public class ActInfoEntity extends BaseEpdcEntity {
 	 */
 	private Integer actQuotaCategory;
 
+	/**
+	 * 活动新闻稿
+	 */
+	private String actNewsContent;
 }
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml
index 530b433a..31d3fc6c 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml
@@ -41,6 +41,7 @@
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
         <result property="actUserDefaultState" column="ACT_USER_DEFAULT_STATE"/>
+        <result property="actNewsContent" column="ACT_NEWS_CONTENT"/>
     </resultMap>
     <resultMap type="com.elink.esua.epdc.activity.result.ActInfoResultDTO" id="actResultMap">
         <result property="id" column="ID"/>
@@ -487,7 +488,8 @@
         eai.REWARD,
         eai.PUNISHMENT_POINTS as punishmentPoints,
         eai.REQUIREMENT as requirement,
-        eai.ACT_CONTENT as actContent
+        eai.ACT_CONTENT as actContent,
+        ACT_NEWS_CONTENT as actNewsContent
         from epdc_act_info eai
         where eai.DEL_FLAG='0'
         and eai.id=#{actId}