1、修改统计会议纪要推送数据接口

src/main/java/com/cmeeting/service/impl/MeetingInfoServiceImpl.java

@@ -453,12 +453,14 @@ public class MeetingInfoServiceImpl extends ServiceImpl<MeetingInfoMapper, Meeti
 
         List<Map<String, Object>> mapList = new ArrayList<>();
         for (Map.Entry<String, List<MeetingInfo>> entry : hostUidMeetingInfoMap.entrySet()) {
+            // 使用linkedHashMap，保证输出到excel中的顺序
             Map<String, Object> map = new LinkedHashMap<>();
 
             String host = hostMap.get(entry.getKey());
             List<MeetingInfo> meetingList = entry.getValue();
             Integer totalNum = meetingList.size();
-            Integer newNum=0,  generatErrorNum=0, noteGeneratedNum=0, pushSuccessNum=0, pushErrorNum=0, emptyNum=0;
+            //    没有转录文件会议，需要生成会议纪要的会议，       待处理，    处理中，             纪要生成成功，         推送成功，         推送失败
+            Integer  emptyNum=0, emailPushAccessNum=0, newNum=0,  generatErrorNum=0, noteGeneratedNum=0, pushSuccessNum=0, pushErrorNum=0;
 
             for (MeetingInfo meetingInfo : meetingList) {
                 if (meetingInfo.getStatus() == MeetingState.NEW.getCode()) {
@@ -475,15 +477,20 @@ public class MeetingInfoServiceImpl extends ServiceImpl<MeetingInfoMapper, Meeti
                 if (meetingInfo.getIsGenerated() || meetingInfo.getStatus() == MeetingState.NOTE_GENERATED.getCode()) {
                     noteGeneratedNum++;
                 }
+                if (meetingInfo.getEmailPushAccess()) {
+                    emailPushAccessNum++;
+                }
             }
             map.put("host", host);
             map.put("totalNum", totalNum);
+            map.put("avaliableNum", totalNum - emptyNum);
+            map.put("emptyNum", emptyNum);
+            map.put("emailPushAccessNum", emailPushAccessNum);
             map.put("newNum", newNum);
             map.put("generatErrorNum", generatErrorNum);
             map.put("noteGeneratedNum", noteGeneratedNum);
             map.put("pushErrorNum", pushErrorNum);
             map.put("pushSuccessNum", pushSuccessNum);
-            map.put("emptyNum", emptyNum);
             mapList.add(map);
         }
 
@@ -491,7 +498,7 @@ public class MeetingInfoServiceImpl extends ServiceImpl<MeetingInfoMapper, Meeti
         OutputStream outputStream = null;
         ExcelWriter writer = ExcelUtil.getWriter(true);
         try {
-            String title = String.format("会议纪要推送统计表-%s", DateUtil.format(now, "yyyy-MM-dd"));
+            String title = String.format("会议纪要推送统计表_%s-%s", DateUtil.format(startTime, "yyyyMMdd"), DateUtil.format(endTime, "yyyyMMdd"));
 
             outputStream = response.getOutputStream();
             String fileName = String.format("%s.xlsx", title);
@@ -500,13 +507,15 @@ public class MeetingInfoServiceImpl extends ServiceImpl<MeetingInfoMapper, Meeti
 
 
             writer.addHeaderAlias("host", "主持人");
-            writer.addHeaderAlias("totalNum", "会议总数");
+            writer.addHeaderAlias("totalNum", "总会议");
+            writer.addHeaderAlias("avaliableNum", "有效会议");
+            writer.addHeaderAlias("emptyNum", "没有转录文件");
+            writer.addHeaderAlias("emailPushAccessNum", "需生成纪要的会议总数");
             writer.addHeaderAlias("newNum", "待处理");
             writer.addHeaderAlias("generatErrorNum", "处理中");
             writer.addHeaderAlias("noteGeneratedNum", "纪要生成成功");
             writer.addHeaderAlias("pushSuccessNum", "纪要推送成功");
             writer.addHeaderAlias("pushErrorNum", "纪要推送失败");
-            writer.addHeaderAlias("emptyNum", "没有转录文件");
             // 合并单元格后的标题行，使用默认标题样式
             writer.merge(writer.getHeaderAlias().size() - 1, title);
             // 一次性写出内容，使用默认样式，强制输出标题