磅单图片显示

performance-web/src/main/java/com/clx/performance/dao/OrderChildImageDao.java

@@ -19,7 +19,7 @@ public interface OrderChildImageDao extends BaseDao<OrderChildImageMapper, Order
     boolean deleteUnload(String childNo);
     boolean deleteLoadAndUnload(String childNo);
 
-    Optional<List<OrderChildImage>> getImages(String childNo, Integer type);
+    List<OrderChildImage> getImages(String childNo, Integer type);
 
     Optional<List<OrderChildImage>> listLoadAndUnload(String childNo);
 

performance-web/src/main/java/com/clx/performance/dao/impl/OrderChildImageImpl.java

@@ -7,6 +7,7 @@ import com.msl.common.base.Optional;
 import com.msl.common.dao.impl.BaseDaoImpl;
 import org.springframework.stereotype.Repository;
 
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -54,9 +55,9 @@ public class OrderChildImageImpl extends BaseDaoImpl<OrderChildImageMapper, Orde
     }
 
     @Override
-    public Optional<List<OrderChildImage>> getImages(String childNo, Integer type) {
+    public List<OrderChildImage> getImages(String childNo, Integer type) {
         return Optional.ofEmpty(list(lQrWrapper()
                 .eq(OrderChildImage::getChildNo, childNo)
-                .eq(OrderChildImage::getType, type)));
+                .eq(OrderChildImage::getType, type))).orElseGet(Collections::emptyList);
     }
 }

performance-web/src/main/java/com/clx/performance/service/impl/OrderChildPoundAuditServiceImpl.java

@@ -51,8 +51,8 @@ public class OrderChildPoundAuditServiceImpl  implements OrderChildPoundAuditSer
     @Override
     public OrderChildPoundAuditDetailVO getPoundAuditDetail(String childNo) {
         OrderChildPoundAudit poundAuditDetail = orderChildPoundAuditDao.getPoundAuditDetail(childNo).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
-        List<OrderChildImage> loadImages = orderChildImageDao.getImages(childNo, OrderChildImage.Type.LOAD.getCode()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
-        List<OrderChildImage> unloadImages = orderChildImageDao.getImages(childNo, OrderChildImage.Type.UNLOAD.getCode()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+        List<OrderChildImage> loadImages = orderChildImageDao.getImages(childNo, OrderChildImage.Type.LOAD.getCode());
+        List<OrderChildImage> unloadImages = orderChildImageDao.getImages(childNo, OrderChildImage.Type.UNLOAD.getCode());
         OrderChildPoundAuditDetailVO vo = new OrderChildPoundAuditDetailVO();
         vo.setChildNo(childNo);
         vo.setLoadImages(loadImages.stream().map(OrderChildImage::getImage).collect(Collectors.toList()));

performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java

@@ -907,8 +907,8 @@ public class OrderChildServiceImpl implements OrderChildService {
         carrierOrderChildDetailVO.setRealFreight(realFreight);
 
         //磅单图片
-        List<OrderChildImage> loadImages = orderChildImageDao.getImages(childNo, OrderChildImage.Type.LOAD.getCode()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
-        List<OrderChildImage> unloadImages = orderChildImageDao.getImages(childNo, OrderChildImage.Type.UNLOAD.getCode()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+        List<OrderChildImage> loadImages = orderChildImageDao.getImages(childNo, OrderChildImage.Type.LOAD.getCode());
+        List<OrderChildImage> unloadImages = orderChildImageDao.getImages(childNo, OrderChildImage.Type.UNLOAD.getCode());
         carrierOrderChildDetailVO.setLoadImageList(loadImages.stream().map(OrderChildImage::getImage).collect(Collectors.toList()));
         carrierOrderChildDetailVO.setUnloadImageList(unloadImages.stream().map(OrderChildImage::getImage).collect(Collectors.toList()));
         return carrierOrderChildDetailVO;