Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/huiju/estateagents/excel/ActivityStatistics/TsChannelDaily.java

@@ -1,5 +1,6 @@
 package com.huiju.estateagents.excel.ActivityStatistics;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import lombok.Data;
@@ -48,4 +49,10 @@ public class TsChannelDaily {
     @ExcelProperty(value = "访问次数", index = 5)
     private Integer visitNum;
 
+    /**
+     * 活动ID
+     */
+    @ExcelIgnore
+    private String targetId;
+
 }

src/main/java/com/huiju/estateagents/service/impl/TaChannelServiceImpl.java

@@ -60,6 +60,11 @@ public class TaChannelServiceImpl extends ServiceImpl<TaChannelMapper, TaChannel
             orderType = "desc";
         }
         IPage<TsActivityDaily> data = taChannelMapper.getChannelIntroductionList(pg, orgId,startDate,endDate,channelType,buildingId, channelId, sortField, orderType,taPersonBuildings);
+        List<TsActivityDaily> records = data.getRecords();
+        records.forEach(e -> {
+            List<ChannelVisitPersonNum> channelPersonNumListExport = taChannelMapper.getChannelPersonNumListExport(orgId, channelId, e.getTargetId(), e.getTargetType(), buildingId, startDate, endDate);
+            e.setVisitPersons(channelPersonNumListExport.size());
+        });
         return ResponseBean.success(data);
     }
 
@@ -135,6 +140,9 @@ public class TaChannelServiceImpl extends ServiceImpl<TaChannelMapper, TaChannel
     public List<TsChannelDaily> getChannelIntroductionListExport(Integer orgId, LocalDate startDate, LocalDate endDate, String channelType, String buildingId, Integer channelId, List<TaPersonBuilding> taPersonBuildings) {
         List<TsChannelDaily> channelIntroductionListExport = taChannelMapper.getChannelIntroductionListExport(orgId, startDate, endDate, channelType, buildingId, channelId,taPersonBuildings);
         channelIntroductionListExport.forEach(e -> {
+            List<ChannelVisitPersonNum> channelPersonNumListExport = taChannelMapper.getChannelPersonNumListExport(orgId, channelId, e.getTargetId(), e.getTargetType(), buildingId, startDate, endDate);
+            e.setVisitPersons(channelPersonNumListExport.size());
+
             String message = "";
             switch (e.getTargetType()){
                 case "building":