服务订单接口-图片返回

src/main/java/com/mmc/oms/service/mall/impl/ServiceOrderTaskServiceImpl.java

@@ -23,6 +23,7 @@ import com.mmc.oms.model.vo.mall.ServiceOrderTaskVO;
 import com.mmc.oms.service.mall.ServiceOrderTaskService;
 import com.mmc.oms.util.BeanCopyUtils;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -112,7 +113,7 @@ public class ServiceOrderTaskServiceImpl
 
     Map<Integer, ServiceOrderProvinceCityDO> provinceCityMap = getOrderProvinceCityDOMapById(orderTaskIds);
 
-    Map<Integer, List<ServiceOrderTaskImageDO>> imageMap = getImageListMapById(orderTaskIds);
+    Map<Integer, ServiceOrderTaskImageDO> imageMap = getImageListMapById(orderTaskIds);
 
     List<Integer> userIds = orderTaskList.stream().map(ServiceOrderTaskDO::getUserAccountId).collect(Collectors.toList());
     Map<Integer, UserAccountSimpleDTO> userMap = getUserDTOMap(request, userIds);
@@ -132,7 +133,7 @@ public class ServiceOrderTaskServiceImpl
       return ResultBody.success();
     }
     Map<Integer, ServiceOrderProvinceCityDO> provinceCityMap = getOrderProvinceCityDOMapById(Arrays.asList(id));
-    Map<Integer, List<ServiceOrderTaskImageDO>> imageMap = getImageListMapById(Arrays.asList(id));
+    Map<Integer, ServiceOrderTaskImageDO> imageMap = getImageListMapById(Arrays.asList(id));
     Map<Integer, UserAccountSimpleDTO> userMap = getUserDTOMap(request, Arrays.asList(order.getUserAccountId()));
     ServiceOrderTaskDTO serviceOrderTaskDTO = getServiceOrderTaskDTO(provinceCityMap, imageMap, order,userMap);
     return ResultBody.success(serviceOrderTaskDTO);
@@ -147,7 +148,7 @@ public class ServiceOrderTaskServiceImpl
     return userMap;
   }
 
-  private ServiceOrderTaskDTO getServiceOrderTaskDTO(Map<Integer, ServiceOrderProvinceCityDO> provinceCityMap, Map<Integer, List<ServiceOrderTaskImageDO>> imageMap, ServiceOrderTaskDO item,Map<Integer, UserAccountSimpleDTO> userMap) {
+  private ServiceOrderTaskDTO getServiceOrderTaskDTO(Map<Integer, ServiceOrderProvinceCityDO> provinceCityMap, Map<Integer, ServiceOrderTaskImageDO> imageMap, ServiceOrderTaskDO item,Map<Integer, UserAccountSimpleDTO> userMap) {
     ServiceOrderTaskDTO orderTaskDTO = BeanCopyUtils.properties(item, new ServiceOrderTaskDTO());
     // 订单省市信息
     BeanCopyUtils.properties(provinceCityMap.get(item.getId()), orderTaskDTO);
@@ -155,13 +156,12 @@ public class ServiceOrderTaskServiceImpl
     UserAccountSimpleDTO userAccountSimpleDTO = userMap.get(item.getUserAccountId());
     BeanCopyUtils.properties(userAccountSimpleDTO, orderTaskDTO);
     orderTaskDTO.setUserId(userAccountSimpleDTO==null?null:userAccountSimpleDTO.getId());
-    List<ServiceOrderTaskImageDO> imageDOList = imageMap.get(item.getId());
+    ServiceOrderTaskImageDO serviceOrderTaskImageDO = imageMap.get(item.getId());
     List<String> images = null;
-    if (CollectionUtils.isNotEmpty(imageDOList)) {
-      images =
-          imageDOList.stream()
-              .map(ServiceOrderTaskImageDO::getPicture)
-              .collect(Collectors.toList());
+    if (serviceOrderTaskImageDO!=null &&serviceOrderTaskImageDO.getPicture() !=null) {
+      String pictureStr = serviceOrderTaskImageDO.getPicture();
+      String[] pictures = pictureStr.split(",");
+      images = Arrays.asList(pictures);
     }
     orderTaskDTO.setImages(images);
     orderTaskDTO.setId(item.getId());
@@ -171,15 +171,15 @@ public class ServiceOrderTaskServiceImpl
   /**
    * 根据id集合批量查询服务作业图片
    */
-  private Map<Integer, List<ServiceOrderTaskImageDO>> getImageListMapById(List<Integer> orderTaskIds) {
+  private Map<Integer, ServiceOrderTaskImageDO> getImageListMapById(List<Integer> orderTaskIds) {
     LambdaQueryWrapper<ServiceOrderTaskImageDO> imageWrapper = new LambdaQueryWrapper<>();
     imageWrapper.in(ServiceOrderTaskImageDO::getOrderTaskId, orderTaskIds);
     List<ServiceOrderTaskImageDO> imageList = serviceOrderTaskImageDao.selectList(imageWrapper);
-    Map<Integer, List<ServiceOrderTaskImageDO>> imageMap = new HashMap<>();
+    Map<Integer, ServiceOrderTaskImageDO> imageMap = new HashMap<>();
     if (CollectionUtils.isNotEmpty(imageList)) {
       imageMap =
           imageList.stream()
-              .collect(Collectors.groupingBy(ServiceOrderTaskImageDO::getOrderTaskId));
+              .collect(Collectors.toMap(ServiceOrderTaskImageDO::getOrderTaskId,d->d,(k1,k2)->k1));
     }
     return imageMap;
   }