Merge remote-tracking branch 'origin/test' into test

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActBannerController.java

@@ -52,7 +52,7 @@ public class ActBannerController {
 
     @GetMapping("page")
     public Result<PageData<ActBannerDTO>> page(@RequestParam Map<String, Object> params){
-        PageData<ActBannerDTO> page = actBannerService.page(params);
+        PageData<ActBannerDTO> page = actBannerService.getActBannerPage(params);
         return new Result<PageData<ActBannerDTO>>().ok(page);
     }
 

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActBannerDao.java

@@ -17,10 +17,14 @@
 
 package com.elink.esua.epdc.modules.activity.dao;
 
+import com.elink.esua.epdc.activity.ActBannerDTO;
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
 import com.elink.esua.epdc.modules.activity.entity.ActBannerEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 爱心互助活动banner 爱心互助活动banner
  *
@@ -29,5 +33,5 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface ActBannerDao extends BaseDao<ActBannerEntity> {
-	
+    List<ActBannerDTO> getActBannerlist(Map<String, Object> params);
 }

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActBannerService.java

@@ -44,6 +44,9 @@ public interface ActBannerService extends BaseService<ActBannerEntity> {
      */
     PageData<ActBannerDTO> page(Map<String, Object> params);
 
+    PageData<ActBannerDTO> getActBannerPage(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

@@ -60,6 +60,12 @@ public class ActBannerServiceImpl extends BaseServiceImpl<ActBannerDao, ActBanne
         );
         return getPageData(page, ActBannerDTO.class);
     }
+    @Override
+    public PageData<ActBannerDTO> getActBannerPage(Map<String, Object> params) {
+        IPage<ActBannerDTO> page = getPage(params);
+        List<ActBannerDTO> list = baseDao.getActBannerlist(params);
+        return new PageData<>(list, page.getTotal());
+    }
 
     @Override
     public List<ActBannerDTO> list(Map<String, Object> params) {

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActBannerDao.xml

@@ -22,6 +22,38 @@
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
+    <select id="getActBannerlist" resultMap="actBannerMap">
+        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="startTime != null and startTime != '' and endTime != null and endTime != ''">
+            AND DATE_FORMAT( banner.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
+        </if>
+        <if test="status != null and status != ''">
+            AND banner.STATUS = #{status}
+        </if>
+        ORDER BY
+        banner.CREATED_TIME DESC
+    </select>
 
 
 </mapper>