Commit 5e1c26221f3ae4132859b66471dc20a4d48bffaa
1 parent
90f23d70
修改直播展示页面的排序方式
Showing
1 changed file
with
5 additions
and
5 deletions
src/main/java/com/cnlive/shenhe/controller/LiveController.java
| @@ -140,15 +140,15 @@ public class LiveController { | @@ -140,15 +140,15 @@ public class LiveController { | ||
| 140 | } | 140 | } |
| 141 | String orderByClause=""; | 141 | String orderByClause=""; |
| 142 | if(shenhe_state!=null&&shenhe_state==0){//审核状态：全部待领 | 142 | if(shenhe_state!=null&&shenhe_state==0){//审核状态：全部待领 |
| 143 | - orderByClause="activity_start_time "; | 143 | + orderByClause="pre_start_time "; |
| 144 | }else if(shenhe_state!=null&&shenhe_state==1){//审核状态：待审核 | 144 | }else if(shenhe_state!=null&&shenhe_state==1){//审核状态：待审核 |
| 145 | - orderByClause="activity_start_time "; | 145 | + orderByClause="pre_start_time "; |
| 146 | }else if(shenhe_state!=null&&shenhe_state==2){//审核状态：已审核 | 146 | }else if(shenhe_state!=null&&shenhe_state==2){//审核状态：已审核 |
| 147 | - orderByClause="activity_start_time desc"; | 147 | + orderByClause="pre_start_time desc"; |
| 148 | }else{//审核状态：全部 | 148 | }else{//审核状态：全部 |
| 149 | - orderByClause="is_hot desc, activity_start_time "; | 149 | + orderByClause="is_hot desc, pre_start_time "; |
| 150 | if(activity_status!=null &&(activity_status==0 ||activity_status==2 || activity_status==4)){//直播状态：结束、撤销、下线 | 150 | if(activity_status!=null &&(activity_status==0 ||activity_status==2 || activity_status==4)){//直播状态：结束、撤销、下线 |
| 151 | - orderByClause="is_hot desc, activity_start_time desc"; | 151 | + orderByClause="is_hot desc, pre_start_time desc"; |
| 152 | } | 152 | } |
| 153 | } | 153 | } |
| 154 | PageInfo<ShyLive> livePage = liveService.getListContent(activity_name, start_date,end_date, | 154 | PageInfo<ShyLive> livePage = liveService.getListContent(activity_name, start_date,end_date, |