修改直播审核的导出功能，实现直播完成后的导出

liwei2917
1 parent 43cba551
Showing 4 changed files with 23 additions and 26 deletions
src/main/java/com/cnlive/shenhe/controller/LiveController.java
src/main/java/com/cnlive/shenhe/controller/VideosController.java
src/main/java/com/cnlive/shenhe/serviceImpl/LiveServiceImpl.java
src/main/java/com/cnlive/shenhe/serviceImpl/VideosServiceImpl.java
@@ -362,7 +362,7 @@ public class LiveController {
            spid = null;
        	}
        List<ShyLive> liveList = liveService.findByCondition(activity_name, start_date,end_date,
-       	      activity_id, activity_status, page, pageSize, shenhe_state, orderByClause, spid);
+       	      activity_id, activity_status, page, pageSize, shenhe_state, orderByClause, spid,userId);
        String fileName = "直播数据";
@@ -464,7 +464,7 @@ public class LiveController {
                if(Activity_count==0){
             	   Activity_endTime=CommonUtils.formatDate(liveList.get(i).getActivity_end_time(), "HH:mm");
                }else if(Activity_count > 0){
-            	 pre_endTime="跨"+Activity_count+"天 "+CommonUtils.formatDate(liveList.get(i).getActivity_end_time(), "HH:mm");
+            	   Activity_endTime="跨"+Activity_count+"天 "+CommonUtils.formatDate(liveList.get(i).getActivity_end_time(), "HH:mm");
                }
                cell = row.createCell(10);//列
@@ -392,9 +392,9 @@ public class VideosController extends BaseController {
                 ShySites shySites = sitesService.findspidDescByspid(shyVideosList.get(i).getSpid());
                 if (CommonUtils.isNotNull(shySites)) {
                 	if(CommonUtils.isNotEmpty(shyVideosList.get(i).getCategory())&&shyVideosList.get(i).getCategory().equals(CommonConst.CATEGORY_WITNESS)){
-                		cell.setCellValue(shySites.getName()+"目击者");
+                		cell.setCellValue(shySites.getName()+"(目击者)");
                 	}else if(CommonUtils.isNotEmpty(shyVideosList.get(i).getCategory())&&shyVideosList.get(i).getCategory().equals(CommonConst.CATEGORY_MOMENT)){
-                		cell.setCellValue(shySites.getName()+"朋友圈");
+                		cell.setCellValue(shySites.getName()+"(朋友圈)");
                 	}else{
                 		cell.setCellValue(shySites.getName());
                 	}
@@ -89,7 +89,6 @@ public class LiveServiceImpl {
     		Integer shenhe_state, String orderByClause, Integer spid, String userId) {
         Example example = new Example(ShyLive.class);
         Example.Criteria criteria = example.createCriteria();
-//        Example.Criteria criteria2 = example.createCriteria();
         if (CommonUtils.isNotEmpty(orderByClause)) {
             example.setOrderByClause(orderByClause);
         }
@@ -101,7 +100,6 @@ public class LiveServiceImpl {
                 e.printStackTrace();
             }
             criteria.andGreaterThanOrEqualTo("activity_start_time", startdate);
-//            criteria2.andGreaterThanOrEqualTo("activity_start_time", startdate);
         }
         if ( CommonUtils.isNotEmpty(end_date)) {
         	Timestamp enddate = null;
@@ -111,35 +109,27 @@ public class LiveServiceImpl {
         		e.printStackTrace();
         	}
         	criteria.andLessThanOrEqualTo("activity_end_time", enddate);
-//        	criteria2.andLessThanOrEqualTo("activity_end_time", enddate);
         }
         if (CommonUtils.isNotEmpty(activity_name)) {
             criteria.andLike("activity_name", "%" + activity_name + "%");
-//            criteria2.andLike("activity_name", "%" + activity_name + "%");
         }
         if (CommonUtils.isNotEmpty(activity_id)) {
             criteria.andEqualTo("activity_id", activity_id);
-//            criteria2.andEqualTo("activity_id", activity_id);
         }
         if (CommonUtils.isNotNull(spid)) {
             criteria.andEqualTo("sp_id", spid);
-//            criteria2.andEqualTo("spid", spid);
         }
         if (CommonUtils.isNotNull(shenhe_state)) {
             criteria.andEqualTo("shenhe_state", shenhe_state);
-//            criteria2.andEqualTo("shenhe_state", shenhe_state);
             if (shenhe_state != CommonConst.RECEIVE_BEFORE) {
                 criteria.andEqualTo("auditor", userId);
-//                criteria2.andEqualTo("auditor", userId);
             }
         }
         if (CommonUtils.isNotNull(activity_status) ) {
             criteria.andEqualTo("activity_status", activity_status);
         } 
         criteria.andEqualTo("is_show", 1);
-        //排序
-//        example.setOrderByClause("is_hot desc, activity_start_time desc");
         PageHelper.startPage(page, pageSize, true);
         List<ShyLive> shyLiveList = shyLiveMapper.selectByExample(example);
         PageInfo<ShyLive> pageInfo = new PageInfo<>(shyLiveList);
@@ -220,16 +210,15 @@ public class LiveServiceImpl {
      * 根据条件导出数据excel
      * @return
      */
-    public List<ShyLive> findByCondition(String activity_id,String start_date,String end_date,
-       		String activity_name, Integer activity_status, Integer page,Integer pageSize, 
-       		Integer shenhe_state, String orderByClause, Integer spid) {
+    public List<ShyLive> findByCondition(String activity_name, String start_date, String end_date, 
+    		String activity_id, Integer activity_status, Integer page, Integer pageSize, 
+    		Integer shenhe_state, String orderByClause, Integer spid, String userId) {
         Example example = new Example(ShyLive.class);
         Example.Criteria criteria = example.createCriteria();
         if (CommonUtils.isNotEmpty(orderByClause)) {
             example.setOrderByClause(orderByClause);
         }else{
-        	//默认排序
-            example.setOrderByClause("activity_start_time asc");
+        	example.setOrderByClause("activity_start_time");
         }
         if (CommonUtils.isNotEmpty(start_date)) {
             Timestamp startdate = null;
@@ -252,19 +241,23 @@ public class LiveServiceImpl {
         if (CommonUtils.isNotEmpty(activity_name)) {
             criteria.andLike("activity_name", "%" + activity_name + "%");
         }
-        if (CommonUtils.isNotNull(activity_status) ) {
-            criteria.andEqualTo("activity_status", activity_status);
-        }
+       
         if (CommonUtils.isNotEmpty(activity_id)) {
             criteria.andEqualTo("activity_id", activity_id);
         }
         if (CommonUtils.isNotNull(spid)) {
-            criteria.andEqualTo("spid", spid);
+            criteria.andEqualTo("sp_id", spid);
         }
         if (CommonUtils.isNotNull(shenhe_state)) {
             criteria.andEqualTo("shenhe_state", shenhe_state);
+            if (shenhe_state != CommonConst.RECEIVE_BEFORE) {
+                criteria.andEqualTo("auditor", userId);
+            }
         }
-        
+        if (CommonUtils.isNotNull(activity_status) ) {
+            criteria.andEqualTo("activity_status", activity_status);
+        } 
+        criteria.andEqualTo("is_show", 1);
         List<ShyLive> shyLiveList = shyLiveMapper.selectByExample(example);
         return shyLiveList;
     }
@@ -103,8 +103,12 @@ public class VideosServiceImpl {
         ShyVideos shyVideos = shyVideosMapper.selectByPrimaryKey(id);
         shyVideos.setAuditor_id(auditor_id);
         shyVideos.setState(state);
-        shyVideos.setAttr_tags(attr_tags);
-        shyVideos.setMsg(msg);
+        if(CommonUtils.isNotEmpty(attr_tags)){
+        	shyVideos.setAttr_tags(attr_tags);
+        }
+        if(CommonUtils.isNotEmpty(msg)){
+        	shyVideos.setMsg(msg);
+        }
         shyVideos.setUpdater(updater);
         if(CommonUtils.isNotEmpty(auditor_id)){
         	shyVideos.setReceive(CommonConst.RECEIVE_AFTER);