ydLief寿险公告信息排序调整(序号按大到小排序,并且置顶的排序到最前面)

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

@@ -37,6 +37,9 @@ public class MktAnnouncementDALServiceImpl implements MktAnnouncementDALService
 
     @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