From ce7bd2881f9b9641f454f125887d8e80c40f809c Mon Sep 17 00:00:00 2001
From: liuchuang <123456>
Date: Mon, 6 Sep 2021 17:18:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E4=BC=81=E4=B8=9A=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E7=AE=A1=E7=90=86=E3=80=81=E5=A4=A7=E5=B1=8F=E4=BC=81?=
 =?UTF-8?q?=E4=B8=9A=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=20init?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esua/epdc/controller/ApiActUserRelationController.java  | 2 +-
 .../esua/epdc/activity/result/ActInfoDetailResultDTO.java   | 5 +++++
 .../elink/esua/epdc/modules/activity/dao/ActPeriodDao.java  | 1 +
 .../modules/activity/service/impl/ActPeriodServiceImpl.java | 6 +++++-
 .../src/main/resources/mapper/activity/ActPeriodDao.xml     | 4 ++++
 5 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActUserRelationController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActUserRelationController.java
index cd1bb856..ccfbd3dc 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActUserRelationController.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActUserRelationController.java
@@ -86,7 +86,7 @@ public class ApiActUserRelationController {
         for (String actPeriodId:
              formDto.getActPeriodId()) {
             ActPeriodDTO period = new ActPeriodDTO();
-            period.setActId(actPeriodId);
+            period.setId(actPeriodId);
             periods.add(period);
         }
         actUserRelationDTO.setPeriods(periods);
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 a5bc0959..b76880af 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
@@ -125,4 +125,9 @@ public class ActInfoDetailResultDTO implements Serializable {
 	 * 活动新闻稿
 	 */
 	private String actNewsContent;
+
+	/**
+	 * 活动主办方
+	 */
+	private String sponsor;
 }
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActPeriodDao.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActPeriodDao.java
index 86d40f20..0d05e7ce 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActPeriodDao.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActPeriodDao.java
@@ -62,5 +62,6 @@ public interface ActPeriodDao extends BaseDao<ActPeriodEntity> {
      * @since 2021/9/2 16:29
      */
     List<ActPeriodDTO> selectListOfActPeriodsByActId(String actId);
+    List<ActPeriodDTO> selectActTimeByActId(String actId);
 
 }
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActPeriodServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActPeriodServiceImpl.java
index b8226e72..cb14d666 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActPeriodServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActPeriodServiceImpl.java
@@ -111,7 +111,11 @@ public class ActPeriodServiceImpl extends BaseServiceImpl<ActPeriodDao, ActPerio
 
     @Override
     public List<ActPeriodDTO> listOfActPeriodsByActId(String actId) {
-        return baseDao.selectListOfActPeriodsByActId(actId);
+        List<ActPeriodDTO> data = baseDao.selectListOfActPeriodsByActId(actId);
+        if (CollectionUtil.isEmpty(data)) {
+            data = baseDao.selectActTimeByActId(actId);
+        }
+        return data;
     }
 
 }
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActPeriodDao.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActPeriodDao.xml
index 81e0933d..4411cceb 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActPeriodDao.xml
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActPeriodDao.xml
@@ -34,4 +34,8 @@
             ACT_PERIOD_START_TIME
     </select>
 
+    <select id="selectActTimeByActId" resultType="com.elink.esua.epdc.activity.ActPeriodDTO">
+        SELECT ACT_START_TIME AS actPeriodStartTime, ACT_END_TIME AS actPeriodEndTime FROM epdc_act_info WHERE ID = #{actId}
+    </select>
+
 </mapper>