数据统计查询导出增加ghId

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

@@ -22,6 +22,9 @@ public class GzhDatastatItemExportVO {
     @ExcelProperty("公众号名称")
     private String name;
 
+    @ExcelProperty("公众号ghId")
+    private String ghId;
+
     @ExcelProperty("新增粉丝数")
     private Integer fansIncreaseCount;
 

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

@@ -12,6 +12,9 @@ public class GzhDatastatItemVO {
     @ApiModelProperty(value = "公众号名称")
     private String name;
 
+    @ApiModelProperty(value = "公众号ghId")
+    private String ghId;
+
     @ApiModelProperty(value = "新增粉丝数")
     private Integer fansIncreaseCount;
 

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

@@ -133,6 +133,7 @@ public class ContentPlatformDatastatServiceImpl implements ContentPlatformDatast
             ContentPlatformGzhAccount account = accountMap.get(datastat.getAccountId());
             if (Objects.nonNull(account)) {
                 vo.setName(account.getName());
+                vo.setGhId(account.getGhId());
             }
             vo.setFansIncreaseCount(datastat.getFansIncreaseCount());
             vo.setFirstLevel(datastat.getFirstLevelCount());
@@ -286,7 +287,7 @@ public class ContentPlatformDatastatServiceImpl implements ContentPlatformDatast
         param.setPageSize(10000);
         Page<GzhDatastatItemVO> pageResult = gzhDatastatList(param);
         List<GzhDatastatItemVO> dataList = pageResult.getObjs();
-        if (param.getType() == 1) {
+        if (param.getType() == 1 || param.getType() == 3) {
             return generateGzhDatastatExcelFile(dataList);
         } else {
             return generateTotalGzhDatastatExcelFile(dataList);
@@ -315,7 +316,7 @@ public class ContentPlatformDatastatServiceImpl implements ContentPlatformDatast
         ArrayList<GzhDatastatItemExportVO> list = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(dataList)) {
             for (GzhDatastatItemVO data : dataList) {
-                list.add(new GzhDatastatItemExportVO(data.getDateStr(), data.getName(),
+                list.add(new GzhDatastatItemExportVO(data.getDateStr(), data.getName(), data.getGhId(),
                         data.getFansIncreaseCount(), data.getFirstLevel(), data.getOpenRate(), data.getScore()));
             }
         } else {