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

yd-api/src/main/java/com/yd/dal/mapper/marketing/MktAnnouncementMapper.java

@@ -23,4 +23,7 @@ public interface MktAnnouncementMapper {
     Page<MktAnnouncement> selectByObj(MktAnnouncement info);
 
     List<MktAnnouncement> findByIsActiveAndAnnouncementAtBefore(@Param("isActive") int isActive,@Param("date") Date date);
+    
+    List<MktAnnouncement> findByIsActiveAndAnnouncementAtBeforeTop(@Param("isActive") int isActive,@Param("date") Date date);
+    
 }
\ No newline at end of file

yd-api/src/main/java/com/yd/dal/service/marketing/Impl/MktAnnouncementDALServiceImpl.java

 package com.yd.dal.service.marketing.Impl;
 
+import java.util.Date;
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.apache.commons.beanutils.BeanPropertyValueEqualsPredicate;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.stereotype.Service;
+
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.yd.dal.entity.marketing.MktAnnouncement;
-import com.yd.dal.entity.marketing.MktLeadsAssignedTrack;
 import com.yd.dal.mapper.marketing.MktAnnouncementMapper;
 import com.yd.dal.service.marketing.MktAnnouncementDALService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.Date;
-import java.util.List;
 
 @Service("mktAnnouncementDALService")
 public class MktAnnouncementDALServiceImpl implements MktAnnouncementDALService {
@@ -24,19 +27,30 @@ public class MktAnnouncementDALServiceImpl implements MktAnnouncementDALService
     }
 
     @Override
+	@SuppressWarnings("unchecked")
     public List<MktAnnouncement> findByType(Long announcementType) {
         MktAnnouncement info = new MktAnnouncement();
         info.setAnnouncementType(announcementType);
         info.setIsActive(1);
-        PageHelper.orderBy("seq asc , created_at desc");
+        PageHelper.orderBy("seq desc , created_at desc");
         Page<MktAnnouncement> mktAnnouncementPageInfo = mktAnnouncementMapper.selectByObj(info);
         PageInfo<MktAnnouncement> pageInfo = new PageInfo<>(mktAnnouncementPageInfo);
         List<MktAnnouncement> list = pageInfo.getList();
+        BeanPropertyValueEqualsPredicate predicateClause = new BeanPropertyValueEqualsPredicate("seq", 0);
+        List<MktAnnouncement> listTop = (List<MktAnnouncement>) CollectionUtils.select(list, predicateClause);
+        if(listTop != null && listTop.size() > 0){
+        	list.removeAll(listTop);
+        	listTop.addAll(list);
+        	return listTop;
+        }
         return list;
     }
 
     @Override
     public List<MktAnnouncement> findByIsActiveAndAnnouncementAtBefore(int isActive, Date date) {
-        return mktAnnouncementMapper.findByIsActiveAndAnnouncementAtBefore(isActive,date);
+    	List<MktAnnouncement> listTop = mktAnnouncementMapper.findByIsActiveAndAnnouncementAtBeforeTop(isActive,date);
+    	List<MktAnnouncement> list = mktAnnouncementMapper.findByIsActiveAndAnnouncementAtBefore(isActive,date);
+    	listTop.addAll(list);
+        return listTop;
     }
 }

yd-api/src/main/resources/mapper/marketing/MktAnnouncementMapper.xml

@@ -213,6 +213,18 @@
     is_active = #{isActive}
     and
     announcement_at <= #{date}
-    order by seq asc , announcement_at desc
+    and seq != 0
+    order by seq desc , announcement_at desc
+  </select>
+  <select id="findByIsActiveAndAnnouncementAtBeforeTop" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from yd_mkt_announcement
+    WHERE
+    is_active = #{isActive}
+    and 
+    announcement_at &lt;= #{date}
+    and seq = 0
+    order by seq desc , announcement_at desc
   </select>
 </mapper>
\ No newline at end of file