直播申请增加品牌及商户名称

直播申请列表根据状态及时间进行排序

src/dsb/com/cnd3b/restcontroller/enterprise/live/SQL/直播申请列表查询.sql

@@ -1,3 +1,4 @@
 select t1.tliveapplyid,t1.createby,t1.createdate,t1.siteid,t1.changeby,t1.changedate,
-t1.tagentsid,t1.tactivityid,t1.checkby,t1.checkdate,t1.fstatus,t1.fnotes,t1.fissecret,t2.tliveid,t2.channelid from tliveapply t1
-left join tlive t2 on t1.tliveapplyid=t2.tliveapplyid and t1.siteid=t2.siteid
+t1.tagentsid,t1.tactivityid,t1.checkby,t1.checkdate,t1.fstatus,t1.fnotes,t1.fissecret,t2.tliveid,t2.channelid,t3.fagentname,t3.fbrand from tliveapply t1
+left join tlive t2 on t1.tliveapplyid=t2.tliveapplyid and t1.siteid=t2.siteid
+left join tagents t3 on t1.siteid=t3.siteid and t1.tagentsid=t3.tagentsid

src/dsb/com/cnd3b/restcontroller/enterprise/live/live.java

@@ -277,7 +277,7 @@ public class live extends Controller {
      * @return
      */
     public String getSYLiveApplyList() {
-        SQLFactory sqlFactory = new SQLFactory(this, "Ö±²¥ÉêÇëÁбí²éѯ", pageSize, pageNumber, "t1.changedate");
+        SQLFactory sqlFactory = new SQLFactory(this, "Ö±²¥ÉêÇëÁбí²éѯ", pageSize, pageNumber, "order by (case when t1.fstatus='ÉêÇë'then 0 else 1 end),t1.screatedate desc");
         Rows rows = dbConnect.runSqlQuery(sqlFactory.getSQL());
         return getSucReturnObject().setDataByPaging(rows).preloading(1).toString();
     }