From 100d659ab4c46d1ba1d0a6a67fb5ec076615b2b9 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.com>
Date: Fri, 3 Dec 2021 14:06:44 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=94=E7=9B=9F=E6=B4=BB=E5=8A=A8=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E9=A6=96=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../elink/esua/epdc/volunteer/VolunteerUnionActDTO.java    | 5 +++++
 .../epdc/volunteer/result/EpdcUnionActListResultDTO.java   | 5 +++++
 .../modules/volunteer/entity/VolunteerUnionActEntity.java  | 4 ++++
 .../resources/mapper/volunteer/VolunteerUnionActDao.xml    | 7 +++++--
 4 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/volunteer/VolunteerUnionActDTO.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/volunteer/VolunteerUnionActDTO.java
index 3e5910d5..0dec0c21 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/volunteer/VolunteerUnionActDTO.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/volunteer/VolunteerUnionActDTO.java
@@ -106,6 +106,11 @@ public class VolunteerUnionActDTO implements Serializable {
      */
 	private String delFlag;
 
+    /**
+     * 活动头图
+     */
+    private String headPic;
+
     /**
      * [0] 活动开始时间
      * [1] 活动结束时间
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/volunteer/result/EpdcUnionActListResultDTO.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/volunteer/result/EpdcUnionActListResultDTO.java
index c838e4d2..86fd65ac 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/volunteer/result/EpdcUnionActListResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/volunteer/result/EpdcUnionActListResultDTO.java
@@ -44,4 +44,9 @@ public class EpdcUnionActListResultDTO implements Serializable {
      * 排序
      */
     private Integer sort;
+
+    /**
+     * 活动头图
+     */
+    private String headPic;
 }
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/entity/VolunteerUnionActEntity.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/entity/VolunteerUnionActEntity.java
index c803f43e..9f021d0a 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/entity/VolunteerUnionActEntity.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/entity/VolunteerUnionActEntity.java
@@ -68,4 +68,8 @@ public class VolunteerUnionActEntity extends BaseEpdcEntity {
      */
 	private Integer sort;
 
+	/**
+	 * 活动头图
+	 */
+	private String headPic;
 }
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/volunteer/VolunteerUnionActDao.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/volunteer/VolunteerUnionActDao.xml
index 436056b9..238d9115 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/volunteer/VolunteerUnionActDao.xml
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/volunteer/VolunteerUnionActDao.xml
@@ -17,6 +17,7 @@
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
         <result property="delFlag" column="DEL_FLAG"/>
+        <result property="headPic" column="HEAD_PIC"/>
     </resultMap>
 
     <select id="getPageList" resultType="com.elink.esua.epdc.volunteer.VolunteerUnionActDTO">
@@ -50,7 +51,8 @@
             a.ACT_END_TIME,
             a.CONTENT,
             a.SORT,
-            u.UNION_NAME
+            u.UNION_NAME,
+            a.HEAD_PIC headPic
         FROM epdc_volunteer_union_act a
         LEFT JOIN epdc_volunteer_union u ON a.UNION_ID = u.ID AND u.DEL_FLAG = '0'
         WHERE a.DEL_FLAG = '0'
@@ -75,7 +77,8 @@
             TITLE,
             ACT_START_TIME,
             ACT_END_TIME,
-            SORT
+            SORT,
+            HEAD_PIC
         FROM epdc_volunteer_union_act
         WHERE DEL_FLAG = '0'
         AND UNION_ID = #{unionActId, jdbcType=VARCHAR}