上报信息上传飞书电子文档，添加任务id、促销员姓名列表

src/main/java/com/wangxiaolu/export/mapper/entity/TemporaryActivityReportedDO.java

@@ -20,6 +20,8 @@ public class TemporaryActivityReportedDO implements Serializable {
 
     private Integer temporaryId;
 
+    private String temporaryName;
+
     private String approveStatus;
 
     @TableField(exist = false)

src/main/java/com/wangxiaolu/export/service/impl/ActivityToFeishuSheetServiceImpl.java

@@ -91,7 +91,10 @@ public class ActivityToFeishuSheetServiceImpl implements ActivityToFeishuSheetSe
     private void activityDataToSheetRow(TemporaryActivityReportedDO rdo, List<TemporaryActivityPhotoDO> temporaryActivityPhotoDOS, List<TemporaryActivityPhotoDO> activityClock) throws Exception {
         List<Object> row = new ArrayList<>();
         // 证明标识（请忽略），一定要在开头第一个单元格有数据，才能保证之后的数据即使缺失也不会串行
+        // A-C：证明标识（请忽略） 问题标识（请忽略）	促销员姓名
         row.add("0");
+        row.add(rdo.getId());
+        row.add(rdo.getTemporaryId() + "-" + rdo.getTemporaryName());
 
         // 月份
         String createDate = rdo.getCreateDate();
@@ -154,22 +157,22 @@ public class ActivityToFeishuSheetServiceImpl implements ActivityToFeishuSheetSe
 
         // 真实pos证明反馈1 >>>
         if (!(photosType7Size < 1 || Objects.isNull(photosType7.get(0)))) {
-            valuesImageToSheet(String.format(rangFormat, "L", "L"), photosType7.get(0).getPhotoUrl());
+            valuesImageToSheet(String.format(rangFormat, "N", "N"), photosType7.get(0).getPhotoUrl());
         }
 
         // 真实pos证明反馈2 >>>
         if (!(photosType7Size < 2 || Objects.isNull(photosType7.get(1)))) {
-            valuesImageToSheetByRobot2(String.format(rangFormat, "M", "M"), photosType7.get(1).getPhotoUrl());
+            valuesImageToSheetByRobot2(String.format(rangFormat, "O", "O"), photosType7.get(1).getPhotoUrl());
         }
 
         // 真实pos证明反馈3 >>>
         if (!(photosType7Size < 3 || Objects.isNull(photosType7.get(2)))) {
-            valuesImageToSheet(String.format(rangFormat, "N", "N"), photosType7.get(2).getPhotoUrl());
+            valuesImageToSheet(String.format(rangFormat, "P", "P"), photosType7.get(2).getPhotoUrl());
         }
 
         // 真实pos证明反馈4 >>>
         if (!(photosType7Size < 4 || Objects.isNull(photosType7.get(3)))) {
-            valuesImageToSheetByRobot2(String.format(rangFormat, "O", "O"), photosType7.get(3).getPhotoUrl());
+            valuesImageToSheetByRobot2(String.format(rangFormat, "Q", "Q"), photosType7.get(3).getPhotoUrl());
         }
         log.info("上传pos照片完成，行号：{}", rowNumStr);
 
@@ -180,22 +183,22 @@ public class ActivityToFeishuSheetServiceImpl implements ActivityToFeishuSheetSe
         Map<Integer, String> clockMap = activityClock.stream().collect(Collectors.toMap(TemporaryActivityPhotoDO::getType, TemporaryActivityPhotoDO::getPhotoUrl));
         // 上班打卡照片 >>>
         if (clockMap.containsKey(4)) {
-            valuesImageToSheet(String.format(rangFormat, "P", "P"), clockMap.get(4));
+            valuesImageToSheet(String.format(rangFormat, "R", "R"), clockMap.get(4));
         }
 
         // 午休下班打卡照片 >>>
         if (clockMap.containsKey(5)) {
-            valuesImageToSheetByRobot2(String.format(rangFormat, "Q", "Q"), clockMap.get(5));
+            valuesImageToSheetByRobot2(String.format(rangFormat, "S", "S"), clockMap.get(5));
         }
 
         // 午休上班打卡照片 >>>
         if (clockMap.containsKey(6)) {
-            valuesImageToSheet(String.format(rangFormat, "R", "R"), clockMap.get(6));
+            valuesImageToSheet(String.format(rangFormat, "T", "T"), clockMap.get(6));
         }
 
         // 下班打卡照片 >>>
         if (clockMap.containsKey(7)) {
-            valuesImageToSheetByRobot2(String.format(rangFormat, "S", "S"), clockMap.get(7));
+            valuesImageToSheetByRobot2(String.format(rangFormat, "U", "U"), clockMap.get(7));
         }
         log.info("上传打卡照片完成，行号：{}", rowNumStr);
 
@@ -206,22 +209,22 @@ public class ActivityToFeishuSheetServiceImpl implements ActivityToFeishuSheetSe
         int photosType1Size = photosType1.size();
         // 推广试吃照片1 >>>
         if (!(photosType1Size < 1 || Objects.isNull(photosType1.get(0)))) {
-            valuesImageToSheet(String.format(rangFormat, "T", "T"), photosType1.get(0).getPhotoUrl());
+            valuesImageToSheet(String.format(rangFormat, "V", "V"), photosType1.get(0).getPhotoUrl());
         }
 
         // 推广试吃照片2 >>>
         if (!(photosType1Size < 2 || Objects.isNull(photosType1.get(1)))) {
-            valuesImageToSheetByRobot2(String.format(rangFormat, "U", "U"), photosType1.get(1).getPhotoUrl());
+            valuesImageToSheetByRobot2(String.format(rangFormat, "W", "W"), photosType1.get(1).getPhotoUrl());
         }
 
         // 推广试吃照片3 >>>
         if (!(photosType1Size < 3 || Objects.isNull(photosType1.get(2)))) {
-            valuesImageToSheet(String.format(rangFormat, "V", "V"), photosType1.get(2).getPhotoUrl());
+            valuesImageToSheet(String.format(rangFormat, "X", "X"), photosType1.get(2).getPhotoUrl());
         }
 
         // 推广试吃照片4 >>>
         if (!(photosType1Size < 4 || Objects.isNull(photosType1.get(3)))) {
-            valuesImageToSheetByRobot2(String.format(rangFormat, "W", "W"), photosType1.get(3).getPhotoUrl());
+            valuesImageToSheetByRobot2(String.format(rangFormat, "Y", "Y"), photosType1.get(3).getPhotoUrl());
         }
         log.info("上传推广-试吃照片完成，行号：{}", rowNumStr);
 
@@ -232,22 +235,22 @@ public class ActivityToFeishuSheetServiceImpl implements ActivityToFeishuSheetSe
         int photosType2Size = photosType2.size();
         // 推广互动照片1 >>>
         if (!(photosType2Size < 1 || Objects.isNull(photosType2.get(0)))) {
-            valuesImageToSheet(String.format(rangFormat, "X", "X"), photosType2.get(0).getPhotoUrl());
+            valuesImageToSheet(String.format(rangFormat, "Z", "Z"), photosType2.get(0).getPhotoUrl());
         }
 
         // 推广互动照片2 >>>
         if (!(photosType2Size < 2 || Objects.isNull(photosType2.get(1)))) {
-            valuesImageToSheetByRobot2(String.format(rangFormat, "Y", "Y"), photosType2.get(1).getPhotoUrl());
+            valuesImageToSheetByRobot2(String.format(rangFormat, "AA", "AA"), photosType2.get(1).getPhotoUrl());
         }
 
         // 推广互动照片3 >>>
         if (!(photosType2Size < 3 || Objects.isNull(photosType2.get(2)))) {
-            valuesImageToSheet(String.format(rangFormat, "Z", "Z"), photosType2.get(2).getPhotoUrl());
+            valuesImageToSheet(String.format(rangFormat, "AB", "AB"), photosType2.get(2).getPhotoUrl());
         }
 
         // 推广互动照片4 >>>
         if (!(photosType2Size < 4 || Objects.isNull(photosType2.get(3)))) {
-            valuesImageToSheetByRobot2(String.format(rangFormat, "AA", "AA"), photosType2.get(3).getPhotoUrl());
+            valuesImageToSheetByRobot2(String.format(rangFormat, "AC", "AC"), photosType2.get(3).getPhotoUrl());
         }
         log.info("上传推广-互动照片完成，行号：{}", rowNumStr);
 
@@ -258,22 +261,22 @@ public class ActivityToFeishuSheetServiceImpl implements ActivityToFeishuSheetSe
         int photosType3Size = photosType3.size();
         // 推广成交照片1 >>>
         if (!(photosType3Size < 1 || Objects.isNull(photosType3.get(0)))) {
-            valuesImageToSheet(String.format(rangFormat, "AB", "AB"), photosType3.get(0).getPhotoUrl());
+            valuesImageToSheet(String.format(rangFormat, "AD", "AD"), photosType3.get(0).getPhotoUrl());
         }
 
         // 推广成交照片2 >>>
         if (!(photosType3Size < 2 || Objects.isNull(photosType3.get(1)))) {
-            valuesImageToSheetByRobot2(String.format(rangFormat, "AC", "AC"), photosType3.get(1).getPhotoUrl());
+            valuesImageToSheetByRobot2(String.format(rangFormat, "AE", "AE"), photosType3.get(1).getPhotoUrl());
         }
 
         // 推广成交照片3 >>>
         if (!(photosType3Size < 3 || Objects.isNull(photosType3.get(2)))) {
-            valuesImageToSheet(String.format(rangFormat, "AD", "AD"), photosType3.get(2).getPhotoUrl());
+            valuesImageToSheet(String.format(rangFormat, "AF", "AF"), photosType3.get(2).getPhotoUrl());
         }
 
         // 推广成交照片4 >>>
         if (!(photosType3Size < 4 || Objects.isNull(photosType3.get(3)))) {
-            valuesImageToSheetByRobot2(String.format(rangFormat, "AE", "AE"), photosType3.get(3).getPhotoUrl());
+            valuesImageToSheetByRobot2(String.format(rangFormat, "AG", "AG"), photosType3.get(3).getPhotoUrl());
         }
         log.info("上传推广-成交照片完成，行号：{}", rowNumStr);
     }
@@ -282,7 +285,7 @@ public class ActivityToFeishuSheetServiceImpl implements ActivityToFeishuSheetSe
         String redisKey = getRowNumRedisKey();
         String rowNumStr = redisCache.get(redisKey);
         Integer rowNumNext = StringUtils.isBlank(rowNumStr) ? 2 : Integer.parseInt(rowNumStr) + 1;
-        String range = sheetInfoD.getSheetId() + "!A" + rowNumNext + ":K" + rowNumNext;
+        String range = sheetInfoD.getSheetId() + "!A" + rowNumNext + ":M" + rowNumNext;
 
         Integer rowNumEnd = feishuSheetUtils.appendValueToSheet(range, rowData, sheetInfoD.getSheetToken(), getFeishuTenantToken1());
         if (rowNumEnd < 1) {

src/main/resources/mapper/TemporaryActivityReportedMapper.xml

@@ -22,6 +22,7 @@
         select ar.id,
                ar.temporary_id,
                ar.approver_id,
+               ar.temporary_name,
                ar.approve_name,
                ar.city,
                ar.create_date,
@@ -43,6 +44,7 @@
         select ar.id,
                ar.temporary_id,
                ar.approver_id,
+               ar.temporary_name,
                ar.approve_name,
                ar.city,
                ar.create_date,