--no commit message

app/resource/src/main/java/com/zrqx/resource/bg/mapper/audiolibrary/AudioLibraryMapper.java

@@ -11,6 +11,7 @@ import com.zrqx.resource.commons.form.bg.QueryResourceForPoPForm;
 import com.zrqx.resource.commons.form.bg.audiolibrary.QueryAudioLibraryForm;
 import com.zrqx.resource.commons.form.bg.resource.SearchForm;
 import com.zrqx.resource.commons.model.audiolibrary.AudioLibrary;
+import com.zrqx.resource.commons.vo.bg.StatisticsResourceExportVO;
 import com.zrqx.resource.commons.vo.bg.StatisticsResourceVO;
 import com.zrqx.resource.commons.vo.bg.audiolibrary.AudioLibraryListVO;
 /**
@@ -65,8 +66,31 @@ public interface AudioLibraryMapper extends BaseMapper<AudioLibrary> {
 			+ "where 1=1 " 
 			+ " rlike(ad.code,form.diyTypeCode) "
 			+ " like(a.name,form.name) " 
+			 + " in(bb.id,form.ids) "
 			+ MapperConstants.DATETIME_QUERY_CONDITION
 		    + " order by a.uploadTime desc "
 		    + "</script>")
 	List<StatisticsResourceVO> getStatisticsResource(@Param("form")SearchForm form);
+
+	/**
+	 * 导出统计音频详情
+	 * @param form
+	 * @return
+	 */
+	@Select("<script>" 
+			+ "select DISTINCT a.id,a.name,a.uploadTime,a.cover,a.resourceType,browseNum, "
+			+ "(SELECT COUNT(*) FROM hxwza_order.ord_orderinfo c LEFT JOIN hxwza_order.ord_order b ON c.orderId = b.id WHERE b.status = 6 AND c.goodsid = a.id) tradeNum, "
+			+ "(SELECT COUNT(*) FROM hxwza_resource.res_record WHERE goodsId = a.id) readersNum, "
+			+ "shares, "
+			+ "(SELECT COUNT(*) FROM hxwza_resource.res_resource_relation WHERE objectId = a.id) relatedNum "
+			+ "from hxwza_resource.res_Audio_Library a left join hxwza_resource.res_Audio_Library_Diy_Type ad "
+			+ "on a.id = ad.audioId "
+			+ "where 1=1 " 
+			+ " rlike(ad.code,form.diyTypeCode) "
+			+ " like(a.name,form.name) " 
+			+ " in(a.id,form.ids) "
+			+ MapperConstants.DATETIME_QUERY_CONDITION
+		    + " order by a.uploadTime desc "
+		    + "</script>")
+	List<StatisticsResourceExportVO> exportStatisticsResource(@Param("form")SearchForm form);
 }

app/resource/src/main/java/com/zrqx/resource/bg/mapper/ebook/EbookMapper.java

@@ -10,6 +10,7 @@ import com.zrqx.resource.commons.form.bg.QueryResourceForPoPForm;
 import com.zrqx.resource.commons.form.bg.ebook.QueryEbookInfoForm;
 import com.zrqx.resource.commons.form.bg.resource.SearchForm;
 import com.zrqx.resource.commons.model.ebook.Ebook;
+import com.zrqx.resource.commons.vo.bg.StatisticsResourceExportVO;
 import com.zrqx.resource.commons.vo.bg.StatisticsResourceVO;
 import com.zrqx.resource.commons.vo.bg.ebook.EbookListVO;
 
@@ -118,6 +119,7 @@ public interface EbookMapper extends BaseMapper<Ebook>{
 	        + " WHERE 1 = 1 " 
 	        + " rlike(bdt.code,form.diyTypeCode) "
 	        + " like(bb.name,form.name) " 
+	        + " in(bb.id,form.ids) "
 			+ "<if test='"+ NOTBLANK +"(form.beginTime)'>"
 			+ " AND be.uploadTime &gt;= concat(#{form.beginTime}, ' 00:00:00')"
 			+ "</if>"
@@ -127,4 +129,27 @@ public interface EbookMapper extends BaseMapper<Ebook>{
 			+ "</script>")
 	List<StatisticsResourceVO> getStatisticsResource(@Param("form")SearchForm form);
 
+
+	@Select("<script>"
+			+ "SELECT DISTINCT bb.id,bb.name,bb.resourceType,be.cover,be.uploadTime,browseNum, "
+			+ "(SELECT COUNT(*) FROM hxwza_order.ord_orderinfo a LEFT JOIN hxwza_order.ord_order b ON a.orderId = b.id WHERE b.status = 6 AND a.goodsid = bb.id) tradeNum, "
+			+ "(SELECT COUNT(*) FROM hxwza_resource.res_record WHERE goodsId = bb.id) readersNum, "
+			+ "shares, "
+			+ "(SELECT COUNT(*) FROM hxwza_resource.res_resource_relation WHERE objectId = bb.id) relatedNum "
+			+ " FROM hxwza_resource.res_book bb "  
+	        + " LEFT JOIN hxwza_resource.res_ebook be ON bb.id = be.id "  
+	        + " LEFT JOIN hxwza_resource.res_ebook_diy_type bdt ON be.id = bdt.ebookid "
+	        + " WHERE 1 = 1 " 
+	        + " rlike(bdt.code,form.diyTypeCode) "
+	        + " like(bb.name,form.name) "
+	        + " in(bb.id,form.ids) "
+			+ "<if test='"+ NOTBLANK +"(form.beginTime)'>"
+			+ " AND be.uploadTime &gt;= concat(#{form.beginTime}, ' 00:00:00')"
+			+ "</if>"
+			+ "<if test='form.beginTime!=null and form.endTime!=null'>"
+			+ " AND be.uploadTime &lt;= concat(#{form.endTime}, ' 23:59:59')"
+			+ "</if>"
+			+ "</script>")
+	List<StatisticsResourceExportVO> exportStatisticsResource(@Param("form")SearchForm form);
+
 }

app/resource/src/main/java/com/zrqx/resource/bg/mapper/videolibrary/VideoLibraryMapper.java

@@ -11,6 +11,7 @@ import com.zrqx.resource.commons.form.bg.QueryResourceForPoPForm;
 import com.zrqx.resource.commons.form.bg.resource.SearchForm;
 import com.zrqx.resource.commons.form.bg.videolibrary.QueryVideoLibraryForm;
 import com.zrqx.resource.commons.model.videolibrary.VideoLibrary;
+import com.zrqx.resource.commons.vo.bg.StatisticsResourceExportVO;
 import com.zrqx.resource.commons.vo.bg.StatisticsResourceVO;
 import com.zrqx.resource.commons.vo.bg.videolibrary.VideoLibraryListVO;
 /**
@@ -98,8 +99,31 @@ public interface VideoLibraryMapper extends BaseMapper<VideoLibrary> {
 			+ "where 1=1 "
 			+ " rlike(ad.code,form.diyTypeCode) "
 			+ " like(a.name,form.name) " 
+			+ " in(bb.id,form.ids) "
 			+ MapperConstants.DATETIME_QUERY_CONDITION
 		    + " order by a.uploadTime desc "
 		    + "</script>")
 	List<StatisticsResourceVO> getStatisticsResource(@Param("form")SearchForm form);
+
+	/**
+	 * 导出音频详情统计
+	 * @param form
+	 * @return
+	 */
+	@Select("<script>" 
+			+ "select DISTINCT a.id,a.name,a.uploadTime,a.cover,a.resourceType,browseNum, "
+			+ "(SELECT COUNT(*) FROM hxwza_order.ord_orderinfo c LEFT JOIN hxwza_order.ord_order b ON c.orderId = b.id WHERE b.status = 6 AND c.goodsid = a.id) tradeNum, "
+			+ "(SELECT COUNT(*) FROM hxwza_resource.res_record WHERE goodsId = a.id) readersNum, "
+			+ "shares, "
+			+ "(SELECT COUNT(*) FROM hxwza_resource.res_resource_relation WHERE objectId = a.id) relatedNum "
+			+ "from hxwza_resource.res_Video_Library a left join hxwza_resource.res_Video_Library_Diy_Type ad "
+			+ "on a.id = ad.videoId "
+			+ "where 1=1 "
+			+ " rlike(ad.code,form.diyTypeCode) "
+			+ " like(a.name,form.name) " 
+			+ " in(a.id,form.ids) " 
+			+ MapperConstants.DATETIME_QUERY_CONDITION
+		    + " order by a.uploadTime desc "
+		    + "</script>")
+	List<StatisticsResourceExportVO> exportStatisticsResource(@Param("form")SearchForm form);
 }

app/resource/src/main/java/com/zrqx/resource/bg/service/audiolibrary/AudioLibrarySerivceImpl.java

@@ -48,6 +48,7 @@ import com.zrqx.resource.commons.model.qrcode.QrCode;
 import com.zrqx.resource.commons.model.record.Record;
 import com.zrqx.resource.commons.model.resourcerelation.RelationAuthor;
 import com.zrqx.resource.commons.model.shoppingcart.ShoppingCart;
+import com.zrqx.resource.commons.vo.bg.StatisticsResourceExportVO;
 import com.zrqx.resource.commons.vo.bg.StatisticsResourceVO;
 import com.zrqx.resource.commons.vo.bg.audiolibrary.AudioLibraryListVO;
 
@@ -317,4 +318,9 @@ public class AudioLibrarySerivceImpl extends BaseServiceImpl<AudioLibrary,String
 		List<StatisticsResourceVO> list = mapper.getStatisticsResource(form);
 		return new PageInfo<StatisticsResourceVO>(list);
 	}
+	@Override
+	public List<StatisticsResourceExportVO> exportStatisticsResource(SearchForm form) {
+		List<StatisticsResourceExportVO> list = mapper.exportStatisticsResource(form);
+		return list;
+	}
 }

app/resource/src/main/java/com/zrqx/resource/bg/service/audiolibrary/AudioLibraryService.java

@@ -11,6 +11,7 @@ import com.zrqx.resource.commons.form.bg.audiolibrary.SaveAudioLibraryForm;
 import com.zrqx.resource.commons.form.bg.audiolibrary.SaveUpdateAudioLibraryForm;
 import com.zrqx.resource.commons.form.bg.resource.SearchForm;
 import com.zrqx.resource.commons.model.audiolibrary.AudioLibrary;
+import com.zrqx.resource.commons.vo.bg.StatisticsResourceExportVO;
 import com.zrqx.resource.commons.vo.bg.StatisticsResourceVO;
 import com.zrqx.resource.commons.vo.bg.audiolibrary.AudioLibraryListVO;
 /**
@@ -76,4 +77,12 @@ public interface AudioLibraryService extends BaseService<AudioLibrary,String>{
 	 * @return
 	 */
 	PageInfo<StatisticsResourceVO> getStatisticsResource(SearchForm form, PageParam pageParam);
+	
+	/**
+	 * 导出音频详情统计
+	 * @param form
+	 * @param pageParam
+	 * @return
+	 */
+	List<StatisticsResourceExportVO> exportStatisticsResource(SearchForm form);
 }

app/resource/src/main/java/com/zrqx/resource/bg/service/ebook/EbookService.java

@@ -15,6 +15,7 @@ import com.zrqx.resource.commons.form.bg.ebook.SaveEbookForm;
 import com.zrqx.resource.commons.form.bg.ebook.SaveUpdateEbookForm;
 import com.zrqx.resource.commons.form.bg.resource.SearchForm;
 import com.zrqx.resource.commons.model.ebook.Ebook;
+import com.zrqx.resource.commons.vo.bg.StatisticsResourceExportVO;
 import com.zrqx.resource.commons.vo.bg.StatisticsResourceVO;
 import com.zrqx.resource.commons.vo.bg.ebook.EbookListVO;
 
@@ -86,5 +87,12 @@ public interface EbookService extends BaseService<Ebook, String>{
 	 * 查询统计资源详情
 	 */
 	PageInfo<StatisticsResourceVO> getStatisticsResource(SearchForm form, PageParam pageParam);
+	
+	/**
+	 * 导出图书详情
+	 * @param form
+	 * @return
+	 */
+	List<StatisticsResourceExportVO> exportStatisticsResource(SearchForm form);
 
 }

app/resource/src/main/java/com/zrqx/resource/bg/service/ebook/EbookServiceImpl.java

@@ -63,6 +63,7 @@ import com.zrqx.resource.commons.model.qrcode.QrCode;
 import com.zrqx.resource.commons.model.record.Record;
 import com.zrqx.resource.commons.model.resourcerelation.RelationAuthor;
 import com.zrqx.resource.commons.model.shoppingcart.ShoppingCart;
+import com.zrqx.resource.commons.vo.bg.StatisticsResourceExportVO;
 import com.zrqx.resource.commons.vo.bg.StatisticsResourceVO;
 import com.zrqx.resource.commons.vo.bg.ebook.EbookListVO;
 import com.zrqx.resource.commons.vo.bg.ebook.ExcelBookExportVo;
@@ -465,4 +466,11 @@ public class EbookServiceImpl extends BaseServiceImpl<Ebook, String> implements
 		List<StatisticsResourceVO> list = ebookMapper.getStatisticsResource(form);
 		return new PageInfo<StatisticsResourceVO>(list);
 	}
+
+	@Override
+	public List<StatisticsResourceExportVO> exportStatisticsResource(SearchForm form) {
+		List<StatisticsResourceExportVO> list = ebookMapper.exportStatisticsResource(form);
+		return list;
+	}
+
 }

app/resource/src/main/java/com/zrqx/resource/bg/service/videolibrary/VideoLibrarySerivceImpl.java

@@ -51,6 +51,7 @@ import com.zrqx.resource.commons.model.videolibrary.ScheduleRecord;
 import com.zrqx.resource.commons.model.videolibrary.VideoLibrary;
 import com.zrqx.resource.commons.model.videolibrary.VideoLibraryDiyType;
 import com.zrqx.resource.commons.model.videolibrary.VideoLibraryLabelContentDiyType;
+import com.zrqx.resource.commons.vo.bg.StatisticsResourceExportVO;
 import com.zrqx.resource.commons.vo.bg.StatisticsResourceVO;
 import com.zrqx.resource.commons.vo.bg.videolibrary.VideoLibraryListVO;
 import com.zrqx.resource.fg.mapper.videolibrary.ScheduleRecordMapper;
@@ -379,4 +380,13 @@ public class VideoLibrarySerivceImpl extends BaseServiceImpl<VideoLibrary,String
 		List<StatisticsResourceVO> list = mapper.getStatisticsResource(form);
 		return new PageInfo<StatisticsResourceVO>(list);
 	}
+	
+	/**
+	 * 导出音频详情统计
+	 */
+	@Override
+	public List<StatisticsResourceExportVO> exportStatisticsResource(SearchForm form) {
+		List<StatisticsResourceExportVO> list = mapper.exportStatisticsResource(form);
+		return list;
+	}
 }

app/resource/src/main/java/com/zrqx/resource/bg/service/videolibrary/VideoLibraryService.java

@@ -11,6 +11,7 @@ import com.zrqx.resource.commons.form.bg.videolibrary.QueryVideoLibraryForm;
 import com.zrqx.resource.commons.form.bg.videolibrary.SaveUpdateVideoLibraryForm;
 import com.zrqx.resource.commons.form.bg.videolibrary.SaveVideoLibraryForm;
 import com.zrqx.resource.commons.model.videolibrary.VideoLibrary;
+import com.zrqx.resource.commons.vo.bg.StatisticsResourceExportVO;
 import com.zrqx.resource.commons.vo.bg.StatisticsResourceVO;
 import com.zrqx.resource.commons.vo.bg.videolibrary.VideoLibraryListVO;
 /**
@@ -83,5 +84,12 @@ public interface VideoLibraryService extends BaseService<VideoLibrary,String>{
 	 * @return
 	 */
 	PageInfo<StatisticsResourceVO> getStatisticsResource(SearchForm form, PageParam pageParam);
+	
+	/**
+	 * 导出视频详情统计
+	 * @param form
+	 * @return
+	 */
+	List<StatisticsResourceExportVO> exportStatisticsResource(SearchForm form);
 
 }

app/resource/src/main/java/com/zrqx/resource/commons/form/bg/resource/SearchForm.java

 package com.zrqx.resource.commons.form.bg.resource;
 
+import java.util.List;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
-import java.util.Date;
-
 import lombok.Data;
 
 
@@ -23,4 +22,6 @@ public class SearchForm {
 	private String endTime;
 	@ApiModelProperty("自定义分类code")
 	private String diyTypeCode;
+	@ApiModelProperty("ids")
+	private List<String> ids;
 }

app/resource/src/main/java/com/zrqx/resource/commons/vo/bg/StatisticsResourceExportVO.java

 package com.zrqx.resource.commons.vo.bg;
 
-import java.util.Date;
+import com.zrqx.core.util.excelutil.ExcelResources;
 
 import lombok.Data;
 
-import com.zrqx.core.util.excelutil.ExcelResources;
-
 @Data
 public class StatisticsResourceExportVO {
 
-	@ExcelResources(title="会员账号",order=1)
-	private String loginAccount;
-	@ExcelResources(title="登录ip",order=2)
-	private String ip;
-	@ExcelResources(title="登录时间",order=3)
-	private Date uploadTime;
-	@ExcelResources(title="登录方式",order=4)
-	private String channel_zh;
-	@ExcelResources(title="描述",order=5)
-	private String synopsis;
+	@ExcelResources(title="资源名称",order=1)
+	private String name;
+	@ExcelResources(title="浏览量",order=2)
+	private Integer browseNum;
+	@ExcelResources(title="交易次数",order=3)
+	private Integer tradeNum;
+	@ExcelResources(title="阅读人数",order=4)
+	private Integer readersNum;
+	@ExcelResources(title="分享次数",order=5)
+	private Integer shares;
+	@ExcelResources(title="关联资源数",order=6)
+	private Integer relatedNum;
 }

app/resource/src/main/java/com/zrqx/resource/commons/vo/bg/StatisticsResourceVO.java

@@ -6,7 +6,9 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 @Data
 @ApiModel(value="StatisticsResourceVO",description="统计资源详情vo")
-public class StatisticsResourceVO {;
+public class StatisticsResourceVO {
+	@ApiModelProperty(value = "资源id")
+	private String id;
 	@ApiModelProperty(value = "资源名称")
 	private String name;
 	@ApiModelProperty(value = "封面")