Merge branch '20250619-wyp-gzhVideoDatastat' into test

api-module/src/main/java/com/tzld/piaoquan/api/model/param/contentplatform/GzhDatastatListParam.java

@@ -7,7 +7,7 @@ import lombok.Data;
 @Data
 public class GzhDatastatListParam extends PageParam {
 
-    @ApiModelProperty(value = "0-自动回复总计 1-自动回复分账号 2-服务号总计 3-服务号分账号")
+    @ApiModelProperty(value = "0-自动回复总计 1-自动回复分账号 2-服务号总计 3-服务号分账号 4-自动回复分账号分视频")
     private Integer type;
 
     @ApiModelProperty(value = "公众号id")

api-module/src/main/java/com/tzld/piaoquan/api/model/vo/contentplatform/QwDatastatItemExportVO.java

@@ -19,12 +19,15 @@ public class QwDatastatItemExportVO {
     @ExcelProperty("日期")
     private String dateStr;
 
-    @ExcelProperty("传播得分")
-    private Double score;
+    @ExcelProperty("子渠道")
+    private String subChannel;
 
     @ExcelProperty("视频标题")
     private String title;
 
     @ExcelProperty("视频id")
     private Long videoId;
+
+    @ExcelProperty("本渠道裂变率")
+    private Double score;
 }

api-module/src/main/java/com/tzld/piaoquan/api/service/contentplatform/impl/ContentPlatformDatastatServiceImpl.java

@@ -380,6 +380,7 @@ public class ContentPlatformDatastatServiceImpl implements ContentPlatformDatast
         for (ContentPlatformQwDataStat datastat : datastatList) {
             QwDatastatItemVO vo = new QwDatastatItemVO();
             vo.setDateStr(datastat.getDateStr());
+            vo.setSubChannel(datastat.getSubChannel());
             vo.setFirstLevel(datastat.getFirstLevelCount());
             if (Objects.nonNull(datastat.getScore())) {
                 BigDecimal num = BigDecimal.valueOf(datastat.getScore());
@@ -467,7 +468,7 @@ public class ContentPlatformDatastatServiceImpl implements ContentPlatformDatast
         ArrayList<QwDatastatItemExportVO> list = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(dataList)) {
             for (QwDatastatItemVO data : dataList) {
-                list.add(new QwDatastatItemExportVO(data.getDateStr(), data.getScore(), data.getTitle(), data.getVideoId()));
+                list.add(new QwDatastatItemExportVO(data.getDateStr(), data.getSubChannel(), data.getTitle(), data.getVideoId(), data.getScore()));
             }
         } else {
             list.add(new QwDatastatItemExportVO());