周伟鹏 / cnlive_shenhe · Commits

Commit 5fd93cc3007c02ed0933568ab7458844ad029999

Authored by 陈浩
1 parent 134e4db5

update

Inline Side-by-side
Showing 2 changed files with 12 additions and 13 deletions
src/main/java/com/cnlive/shenhe/controller/VideosController.java
  View file @5fd93cc
... ... @@ -101,21 +101,21 @@ public class VideosController {
101 101 * 内容分页列表接口
102 102 * @param video_title
103 103 * @param start_date
  104 + * @param end_date
104 105 * @param state
105 106 * @param page
106 107 * @param pageSize
107 108 * @param orderByClause
108   - * @param key
109 109 * @param spid
110 110 * @return
111 111 */
112 112 @RequestMapping("/table")
113 113 @ResponseBody
114   - public Object getListContent(String video_title,String start_date,Integer state,Integer page,Integer pageSize,String orderByClause,String key,Integer spid){
  114 + public Object getListContent(String video_title,String start_date,String end_date,Integer state,Integer page,Integer pageSize,String orderByClause,Integer spid){
115 115 if(CommonUtils.isNull(page))page=1;
116 116 if(CommonUtils.isNull(pageSize))pageSize=10;
117 117 if(CommonUtils.isNotNull(spid)&&spid==0){spid=82;}
118   - return videosService.getListContent(video_title,start_date,state,page,pageSize,orderByClause,key,spid);
  118 + return videosService.getListContent(video_title,start_date,end_date,state,page,pageSize,orderByClause,spid);
119 119 }
120 120  
121 121 /**
... ...
src/main/java/com/cnlive/shenhe/serviceImpl/VideosServiceImpl.java
  View file @5fd93cc
... ... @@ -44,28 +44,27 @@ public class VideosServiceImpl {
44 44 return shyVideosMapper.updateByPrimaryKeySelective(shyVideos);
45 45 }
46 46  
47   - public PageInfo<ShyVideos> getListContent(String video_title, String start_date,Integer state, Integer page, Integer pageSize, String orderByClause, String key, Integer spid){
  47 + public PageInfo<ShyVideos> getListContent(String video_title, String start_date,String end_date,Integer state, Integer page, Integer pageSize, String orderByClause, Integer spid){
48 48 Example example = new Example(ShyVideos.class);
49 49 Example.Criteria criteria = example.createCriteria();
50 50 if (CommonUtils.isNotEmpty(orderByClause)) {
51 51 example.setOrderByClause(orderByClause);
52 52 }
53   - if (CommonUtils.isNotNull(start_date)) {
54   - example.setOrderByClause("created_at desc");
55   - }
56   - if (CommonUtils.isNotEmpty(key)){
57   - criteria.andEqualTo("name", "%" + key + "%");
58   - criteria.andLike("company", "%" + key + "%");
  53 + if (CommonUtils.isNotEmpty(start_date)&&CommonUtils.isNotEmpty(end_date)) {
  54 + criteria.andGreaterThanOrEqualTo("video_upload_time",start_date);
  55 + criteria.andLessThanOrEqualTo("video_upload_time",end_date);
59 56 }
60 57 if (CommonUtils.isNotEmpty(video_title)){
61   - criteria.andEqualTo("video_title", "%" + video_title + "%");
62 58 criteria.andLike("video_title", "%" + video_title + "%");
63 59 }
64 60 if (CommonUtils.isNotNull(state)){
65   - criteria.andEqualTo("state", "%" + state + "%");
  61 + criteria.andEqualTo("state", state );
66 62 }
67   - if (CommonUtils.isNotNull(spid))
  63 + if (CommonUtils.isNotNull(spid)){
68 64 criteria.andEqualTo("spid", spid);
  65 + }
  66 + //默认按上传时间倒序排序
  67 + example.setOrderByClause("video_upload_time desc");
69 68 PageHelper.startPage(page, pageSize, true);
70 69 List<ShyVideos> shyVideosList = shyVideosMapper.selectByExample(example);
71 70 PageInfo<ShyVideos> pageInfo = new PageInfo<>(shyVideosList);
... ...