飞书表格打卡时间、打卡定位合并

src/main/java/com/wangxiaolu/export/controller/feishu/ActivityToFeishuSheet.java

@@ -41,29 +41,39 @@ public class ActivityToFeishuSheet {
      */
     @PostMapping("/feishu/sheet")
     public void activityList(@RequestBody ActivityVo activityVo) {
-//
-//        /**
-//         * 1>> 查询活动记录
-//         * 查询当天的记录
-//         */
-//        List<TemporaryActivityReportedDO> reportedDos = promotionActivityService.findActivityList(activityVo);
-//        List<Long> activityId = reportedDos.stream().map(TemporaryActivityReportedDO::getId).collect(Collectors.toList());
-//        Map<Long, List<TemporaryActivityPhotoDO>> activityPhotos = promotionActivityService.findActivityPhotos(activityId);
-//
-//        /**
-//         * 2>> 查询打卡记录
-//         */
-//        List<TemporaryActivityClockDO> clockPhoto = promotionActivityService.findClockPhoto(activityVo);
-//        Map<String, List<TemporaryActivityPhotoDO>> clockPhotoMap = new HashMap<>();
-//        clockPhoto.stream().forEach(cp -> {
-//            clockPhotoMap.put(cp.getTemporaryId() + "-" + cp.getCreateDate(), cp.getPhotoList());
-//        });
-//
-//        log.info("============== 活动记录上传飞书 start(" + System.currentTimeMillis() + ") ==============");
-//
-//        activityToFeishuSheetService.activityDataToFeishuSheet(reportedDos,activityPhotos,clockPhotoMap);
-//
-//        log.info("============== 活动记录上传飞书 end(" + System.currentTimeMillis() + ") ==============");
+
+        /**
+         * 1>> 查询活动记录
+         * 查询当天的记录
+         */
+        List<TemporaryActivityReportedDO> reportedDos = promotionActivityService.findActivityList(activityVo);
+
+        log.info("应上传飞书{}条活动记录",reportedDos.size());
+
+        if (CollectionUtils.isEmpty(reportedDos)){
+            log.info("无活动记录，停止上传");
+            return;
+        }
+
+        List<Long> activityIds = reportedDos.stream().map(TemporaryActivityReportedDO::getId).collect(Collectors.toList());
+
+        Map<Long, List<TemporaryActivityPhotoDO>> activityPhotos = promotionActivityService.findActivityPhotos(activityIds);
+        Map<Long, TemporaryActivityClockDO> clockMap = promotionActivityService.findClockInfoByActivityIds(activityIds);
+
+        /**
+         * 2>> 查询打卡图片
+         */
+        List<TemporaryActivityClockDO> clockPhoto = promotionActivityService.findClockPhotoByActivityIds(activityIds);
+
+        Map<String, List<TemporaryActivityPhotoDO>> clockPhotoMap = new HashMap<>();
+        clockPhoto.stream().forEach(cp -> {
+            clockPhotoMap.put(cp.getTemporaryId() + "-" + cp.getCreateDate(), cp.getPhotoList());
+        });
+
+
+        activityToFeishuSheetService.activityDataToFeishuSheet(reportedDos,activityPhotos,clockMap,clockPhotoMap);
+
+        log.info("============== 活动记录上传飞书 end ==============");
     }
 
     @GetMapping("/feishu/yesterday_sheet")