合并分支 'dxy' 到 'qa'

src/main/java/com/wangxiaolu/promotion/pojo/activity/temporary/dto/TemporaryActivityReportedDto.java

@@ -160,20 +160,23 @@ public class TemporaryActivityReportedDto {
      * 试吃品照片
      */
     private List<String> scpPhotoUrls;
+    private List<TemporaryActivityPhotoDto>scpPhotoInfos;
     /**
      * 配发赠品照片
      */
     private List<String> pfzpPhotoUrls;
-
+    private List<TemporaryActivityPhotoDto>pfzpPhotoInfos;
     /**
      * 高峰期在岗
      */
     private List<String> gfqPhotoUrls;
+    private List<TemporaryActivityPhotoDto> gfqPhotoInfos;
 
     /**
      * 试吃必备物料照片
      */
     private List<String> scbbwlPhotoUrls;
+    private List<TemporaryActivityPhotoDto> scbbwlPhotoInfos;
 
     /**
      * 创建时间

src/main/java/com/wangxiaolu/promotion/service/activity/temporary/impl/TemporaryActivityQueryServiceImpl.java

@@ -80,20 +80,13 @@ public class TemporaryActivityQueryServiceImpl implements TemporaryActivityQuery
         wer.setTemporaryId(dto.getTemporaryId())
                 .setReportedId(activityId);
         TemporaryClockDto clockInfo = temporaryActivityClockQueryService.findClockInfo(wer);
-        // 设置 随机任务照片
+        // 设置 高峰期在岗
         TemporaryPhotoWrapper wrapper = new TemporaryPhotoWrapper();
         wrapper.setTemporaryId(dto.getTemporaryId())
                 .setClockId(clockInfo.getId())
                 .setType(ActivityPhotoType.RANDOM_TASK.getType() );
         List<TemporaryActivityPhotoDto> temporaryActivityPhotoDtos = temporaryActivityPhotoDao.selectPhotos(wrapper);
         dto.setRandTaskClockPhotoUrls(temporaryActivityPhotoDtos);
-        TemporaryPhotoWrapper posWrapper = new TemporaryPhotoWrapper();
-        posWrapper.setTemporaryId(dto.getTemporaryId())
-                .setClockId(clockInfo.getId())
-                .setType(ActivityPhotoType.POS_SELL_VOUCHER.getType() );
-        List<TemporaryActivityPhotoDto> posTaskClockPhotoUrls = temporaryActivityPhotoDao.selectPhotos(posWrapper);
-
-        dto.setPosTaskClockPhotoUrls(posTaskClockPhotoUrls);
 
         return dto;
     }
@@ -146,6 +139,11 @@ public class TemporaryActivityQueryServiceImpl implements TemporaryActivityQuery
             dto.setTghdPhotoInfos(reportedGroup.get(ActivityPhotoType.TGHD.getType()));
             dto.setTgcjPhotoInfos(reportedGroup.get(ActivityPhotoType.TGCJ.getType()));
             dto.setPsvPhotoInfos(reportedGroup.get(ActivityPhotoType.POS_SELL_VOUCHER.getType()));
+            dto.setScpPhotoInfos(reportedGroup.get(ActivityPhotoType.TASTY_PHOTO.getType()));
+            dto.setPsvPhotoInfos(reportedGroup.get(ActivityPhotoType.POS_SELL_VOUCHER.getType()));
+            dto.setPfzpPhotoInfos(reportedGroup.get(ActivityPhotoType.SEND_GIFT_PHOTO.getType()));
+            dto.setGfqPhotoInfos(reportedGroup.get(ActivityPhotoType.RANDOM_TASK.getType()));
+            dto.setScbbwlPhotoInfos(reportedGroup.get(ActivityPhotoType.TASTY_MATERIALS.getType()));
         }
     }
 }