banner排序规则：按照创建时间正序排序

招募令列表排序规则：发布活动的时间倒序，最新发布的在最上边
精彩活动列表排序规则：活动开始时间正序，最新（最近、最快）开始的，在最上边
已报名活动列表排序规则：用户报名时间倒序，最新报名的，在最上边

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);
 }

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));
+        List<ActBannerDTO> entityList = baseDao.getAppActBannerlist(params);
-
+        return entityList;
-        return ConvertUtils.sourceToTarget(entityList, ActBannerDTO.class);
     }
 
     private QueryWrapper<ActBannerEntity> getWrapper(Map<String, Object> params) {

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>

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">