From 64f902d5be49b539ea9ace72454c22539daad3ea Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 21 Jul 2020 18:20:51 +0800
Subject: [PATCH] =?UTF-8?q?heart-work:preview=20=E9=A2=84=E8=A7=88?=
 =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E8=AF=A6=E6=83=85api?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dao/LatestActContentDao.java    | 10 ++++++++
 .../java/com/epmet/dao/LatestActInfoDao.java  | 10 ++++++++
 .../impl/LatestActContentServiceImpl.java     |  6 ++---
 .../impl/LatestActInfoServiceImpl.java        |  2 +-
 .../resources/mapper/LatestActContentDao.xml  | 13 +++++++++++
 .../resources/mapper/LatestActInfoDao.xml     | 23 +++++++++++++++++++
 6 files changed, 60 insertions(+), 4 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/LatestActContentDao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/LatestActContentDao.java
index 12568cd4e6..a0cbb2b6e5 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/LatestActContentDao.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/LatestActContentDao.java
@@ -19,6 +19,7 @@ package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.result.work.ActDraftContentDTOResultDTO;
+import com.epmet.dto.result.work.ActPreviewContentResultDTO;
 import com.epmet.entity.LatestActContentEntity;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -50,4 +51,13 @@ public interface LatestActContentDao extends BaseDao<LatestActContentEntity> {
      * @Date 2020/7/20 23:01
      **/
     List<ActDraftContentDTOResultDTO> selectActContentList(String actId);
+
+    /**
+     * @return java.util.List<com.epmet.dto.result.work.ActPreviewContentResultDTO>
+     * @param actId
+     * @author yinzuomei
+     * @description 预览-查看活动详情
+     * @Date 2020/7/21 18:07
+     **/
+    List<ActPreviewContentResultDTO> previewActContent(String actId);
 }
\ No newline at end of file
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/LatestActInfoDao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/LatestActInfoDao.java
index 0cd96b4a67..d1a00cb15d 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/LatestActInfoDao.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/LatestActInfoDao.java
@@ -18,6 +18,7 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.result.work.ActPreviewResultDTO;
 import com.epmet.dto.result.work.LatestDraftActInfoResultDTO;
 import com.epmet.entity.LatestActInfoEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -48,4 +49,13 @@ public interface LatestActInfoDao extends BaseDao<LatestActInfoEntity> {
      * @Date 2020/7/20 23:05
      **/
     LatestDraftActInfoResultDTO selectLatestActDraft(String userId);
+
+    /**
+     * @return com.epmet.dto.result.work.ActPreviewResultDTO
+     * @param actDraftId
+     * @author yinzuomei
+     * @description 预览-查看活动详情
+     * @Date 2020/7/21 17:56
+     **/
+    ActPreviewResultDTO previewActInfo(String actDraftId);
 }
\ No newline at end of file
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LatestActContentServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LatestActContentServiceImpl.java
index 03c0e5621d..e60c7d539e 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LatestActContentServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LatestActContentServiceImpl.java
@@ -142,15 +142,15 @@ public class LatestActContentServiceImpl extends BaseServiceImpl<LatestActConten
     }
 
     /**
-     * @param actDraftId latest_act_info主键
+     * @param actId latest_act_info主键
      * @return java.util.List<com.epmet.dto.result.work.ActPreviewContentResultDTO>
      * @author yinzuomei
      * @description 预览-查看活动详情
      * @Date 2020/7/21 17:47
      **/
     @Override
-    public List<ActPreviewContentResultDTO> previewActContent(String actDraftId) {
-        return null;
+    public List<ActPreviewContentResultDTO> previewActContent(String actId) {
+        return baseDao.previewActContent(actId);
     }
 
 }
\ No newline at end of file
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LatestActInfoServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LatestActInfoServiceImpl.java
index dba3dc1f94..fb1a572fde 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LatestActInfoServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LatestActInfoServiceImpl.java
@@ -174,7 +174,7 @@ public class LatestActInfoServiceImpl extends BaseServiceImpl<LatestActInfoDao,
      **/
     @Override
     public ActPreviewResultDTO previewActInfo(String actDraftId) {
-        return null;
+        return baseDao.previewActInfo(actDraftId);
     }
 
 
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/LatestActContentDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/LatestActContentDao.xml
index 44733dcca7..68f536b24d 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/LatestActContentDao.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/LatestActContentDao.xml
@@ -37,4 +37,17 @@
         ORDER BY
             lac.ORDER_NUM ASC
     </select>
+
+    <!--  预览-查看活动详情  -->
+    <select id="previewActContent" parameterType="java.lang.String" resultType="com.epmet.dto.result.work.ActPreviewContentResultDTO">
+        SELECT
+            lac.CONTENT,lac.CONTENT_TYPE
+        FROM
+            latest_act_content lac
+        WHERE
+            lac.DEL_FLAG = '0'
+            AND lac.ACT_ID = #{actId}
+        ORDER BY
+            lac.ORDER_NUM ASC
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/LatestActInfoDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/LatestActInfoDao.xml
index e8d11c7b25..28b43cd8cf 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/LatestActInfoDao.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/LatestActInfoDao.xml
@@ -95,4 +95,27 @@
             lai.CREATED_TIME DESC
             LIMIT 1
     </select>
+
+    <!--  预览-查看活动详情  -->
+    <select id="previewActInfo" parameterType="java.lang.String" resultType="com.epmet.dto.result.work.ActPreviewResultDTO">
+        SELECT
+            lai.id AS actDraftId,
+            lai.title AS title,
+            lai.ACT_QUOTA AS actQuota,
+            lai.ACT_QUOTA_CATEGORY AS actQuotaCategory,
+            lai.REWARD AS reward,
+            lai.ACT_START_TIME AS actStartTime,
+            lai.ACT_END_TIME AS actEndTime,
+            lai.ACT_ADDRESS AS actAddress,
+            lai.SIGN_UP_END_TIME AS signUpEndTime,
+            lai.REQUIREMENT AS requirement,
+            lai.SPONSOR_NAME AS sponsorName,
+            lai.SPONSOR_CONTACTS AS sponsorContacts,
+            lai.SPONSOR_TEL AS sponsorTel
+        FROM
+            latest_act_info lai
+        WHERE
+            lai.DEL_FLAG = '0'
+            AND lai.ID = #{actDraftId}
+    </select>
 </mapper>
\ No newline at end of file