From ea79b565a8f59670fdee5ae824f4c094ba15cf47 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Sat, 8 Feb 2020 11:09:39 +0800
Subject: [PATCH] =?UTF-8?q?banner=E6=8E=92=E5=BA=8F=E8=A7=84=E5=88=99?=
 =?UTF-8?q?=EF=BC=9A=E6=8C=89=E7=85=A7=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E6=AD=A3=E5=BA=8F=E6=8E=92=E5=BA=8F=20=E6=8B=9B=E5=8B=9F?=
 =?UTF-8?q?=E4=BB=A4=E5=88=97=E8=A1=A8=E6=8E=92=E5=BA=8F=E8=A7=84=E5=88=99?=
 =?UTF-8?q?=EF=BC=9A=E5=8F=91=E5=B8=83=E6=B4=BB=E5=8A=A8=E7=9A=84=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E5=80=92=E5=BA=8F=EF=BC=8C=E6=9C=80=E6=96=B0=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83=E7=9A=84=E5=9C=A8=E6=9C=80=E4=B8=8A=E8=BE=B9=20?=
 =?UTF-8?q?=E7=B2=BE=E5=BD=A9=E6=B4=BB=E5=8A=A8=E5=88=97=E8=A1=A8=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=E8=A7=84=E5=88=99=EF=BC=9A=E6=B4=BB=E5=8A=A8=E5=BC=80?=
 =?UTF-8?q?=E5=A7=8B=E6=97=B6=E9=97=B4=E6=AD=A3=E5=BA=8F=EF=BC=8C=E6=9C=80?=
 =?UTF-8?q?=E6=96=B0=EF=BC=88=E6=9C=80=E8=BF=91=E3=80=81=E6=9C=80=E5=BF=AB?=
 =?UTF-8?q?=EF=BC=89=E5=BC=80=E5=A7=8B=E7=9A=84=EF=BC=8C=E5=9C=A8=E6=9C=80?=
 =?UTF-8?q?=E4=B8=8A=E8=BE=B9=20=E5=B7=B2=E6=8A=A5=E5=90=8D=E6=B4=BB?=
 =?UTF-8?q?=E5=8A=A8=E5=88=97=E8=A1=A8=E6=8E=92=E5=BA=8F=E8=A7=84=E5=88=99?=
 =?UTF-8?q?=EF=BC=9A=E7=94=A8=E6=88=B7=E6=8A=A5=E5=90=8D=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E5=80=92=E5=BA=8F=EF=BC=8C=E6=9C=80=E6=96=B0=E6=8A=A5=E5=90=8D?=
 =?UTF-8?q?=E7=9A=84=EF=BC=8C=E5=9C=A8=E6=9C=80=E4=B8=8A=E8=BE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/activity/dao/ActBannerDao.java    |  9 ++++++
 .../service/impl/ActBannerServiceImpl.java    |  5 ++--
 .../mapper/activity/ActBannerDao.xml          | 29 +++++++++++++++++++
 .../resources/mapper/activity/ActInfoDao.xml  | 14 +++++----
 4 files changed, 48 insertions(+), 9 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActBannerDao.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActBannerDao.java
index 5dc823228..190060322 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActBannerDao.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActBannerDao.java
@@ -66,4 +66,13 @@ public interface ActBannerDao extends BaseDao<ActBannerEntity> {
      * @since 2020/2/6 21:24
      */
     void updateBannerByActId(String actId);
+
+    /** 
+     * @Description: 手机端banner查询，根据创建时间 正序排列 
+     * @Param: [params] 
+     * @return: java.util.List<com.elink.esua.epdc.modules.activity.entity.ActBannerEntity> 
+     * @Author: zy 
+     * @Date: 2020-02-08 
+     */ 
+    List<ActBannerDTO> getAppActBannerlist(Map<String, Object> params);
 }
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActBannerServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActBannerServiceImpl.java
index e5d5ebe52..4a16fe7bd 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActBannerServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActBannerServiceImpl.java
@@ -69,9 +69,8 @@ public class ActBannerServiceImpl extends BaseServiceImpl<ActBannerDao, ActBanne
 
     @Override
     public List<ActBannerDTO> list(Map<String, Object> params) {
-        List<ActBannerEntity> entityList = baseDao.selectList(getWrapper(params));
-
-        return ConvertUtils.sourceToTarget(entityList, ActBannerDTO.class);
+        List<ActBannerDTO> entityList = baseDao.getAppActBannerlist(params);
+        return entityList;
     }
 
     private QueryWrapper<ActBannerEntity> getWrapper(Map<String, Object> params) {
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActBannerDao.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActBannerDao.xml
index 51fff403b..db4c75ee5 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActBannerDao.xml
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActBannerDao.xml
@@ -80,4 +80,33 @@
         UPDATE epdc_act_banner SET `STATUS` = '0' WHERE	ACT_ID = #{actId}
     </update>
 
+    <select id="getAppActBannerlist" resultType="com.elink.esua.epdc.activity.ActBannerDTO">
+        SELECT
+        banner.ID,
+        banner.ACT_ID,
+        banner.TITLE,
+        banner.BANNER_IMG,
+        banner.BANNER_TYPE,
+        banner.URL,
+        banner.STATUS,
+        banner.STATUS_TIME,
+        banner.BANNER_POSITION,
+        banner.BROWSE_NUM,
+        banner.DEPT_ID,
+        banner.REVISION,
+        banner.DEL_FLAG,
+        banner.CREATED_BY,
+        banner.CREATED_TIME,
+        banner.UPDATED_BY,
+        banner.UPDATED_TIME
+        FROM
+        epdc_act_banner banner
+        WHERE
+        banner.DEL_FLAG = '0'
+        <if test="status != null and status != ''">
+            AND banner.STATUS = #{status}
+        </if>
+        ORDER BY
+        banner.CREATED_TIME
+    </select>
 </mapper>
\ No newline at end of file
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 fc6c35fdd..32a66a764 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
@@ -185,17 +185,19 @@
         <if test="timestamp != null">
             <![CDATA[ AND DATE_FORMAT(actInfo.CREATED_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> #{timestamp}
         </if>
+        <if test='actId != null and actId != "" '>
+            AND ID = #{actId}
+        </if>
         <if test='actType != null and actType != "" and actType == "0"'>
             <![CDATA[ AND DATE_FORMAT(actInfo.SIGNUP_END_TIME,'%Y-%m-%d %H:%i:%s') >= ]]> #{timestamp}
+            ORDER BY
+            actInfo.PUBLISH_TIME DESC
         </if>
         <if test='actType != null and actType != "" and actType == "1"'>
             <![CDATA[ AND DATE_FORMAT(actInfo.SIGNUP_END_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> #{timestamp}
+            ORDER BY
+            actInfo.ACT_START_TIME
         </if>
-        <if test='actId != null and actId != "" '>
-            AND ID = #{actId}
-        </if>
-        ORDER BY
-        actInfo.CREATED_TIME DESC
         LIMIT #{pageIndex},#{pageSize}
     </select>
     <select id="signupListItemsByApp" resultMap="actAppResultMap">
@@ -252,7 +254,7 @@
             and actInfo.ACT_STATUS = '1'
         </if>
         ORDER BY
-        actInfo.CREATED_TIME DESC
+        relation.SIGNUP_TIME DESC
         LIMIT #{pageIndex},#{pageSize}
     </select>
     <resultMap type="com.elink.esua.epdc.activity.result.ActInfoDetailAppResultDTO" id="actDetailAppResultMap">