Merge branch 'v22.8_sample_img_video_20240822' into test

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

@@ -1768,20 +1768,20 @@ public class OrderChildServiceImpl implements OrderChildService {
         result.setReceiveWaitMode(orderInfoFeign.getReveiveWaitMode());
 
         // 采样 监装信息
-        result.setSendSamplingPic(orderInfoFeign.getSendSamplingPic());
-        result.setSendQualityPosition(orderInfoFeign.getSendQualityPosition());
-        result.setSendSamplingVideo(orderInfoFeign.getSendSamplingVideo());
         SuperviseInfo superviseInfo = getSuperviseInfo(orderChild.getOrderNo(), OrderChildEnum.SuperviseTypeEnum.SUPERVISE_LOAD.getCode());
         result.setSuperviseContacts(superviseInfo != null ? superviseInfo.getSuperviseContacts() : null);
         result.setSuperviseMobile(superviseInfo != null ? superviseInfo.getSuperviseMobile() : null);
+        result.setSendSamplingPic(superviseInfo==null? null :orderInfoFeign.getSendSamplingPic());
+        result.setSendQualityPosition(superviseInfo==null? null :orderInfoFeign.getSendQualityPosition());
+        result.setSendSamplingVideo(superviseInfo==null? null :orderInfoFeign.getSendSamplingVideo());
 
         // 采样 监卸信息
-        result.setReceiveSamplingPic(orderInfoFeign.getReveiveSamplingPic());
-        result.setReceiveQualityPosition(orderInfoFeign.getReveiveQualityPosition());
-        result.setReceiveSamplingVideo(orderInfoFeign.getReveiveSamplingVideo());
         SuperviseInfo superviseUnloadInfo = getSuperviseInfo(orderChild.getOrderNo(), OrderChildEnum.SuperviseTypeEnum.SUPERVISE_UNLOAD.getCode());
         result.setSuperviseUnloadContacts(superviseUnloadInfo != null ? superviseUnloadInfo.getSuperviseContacts() : null);
         result.setSuperviseUnloadMobile(superviseUnloadInfo != null ? superviseUnloadInfo.getSuperviseMobile() : null);
+        result.setReceiveSamplingPic(superviseUnloadInfo==null? null :orderInfoFeign.getReveiveSamplingPic());
+        result.setReceiveQualityPosition(superviseUnloadInfo==null? null :orderInfoFeign.getReveiveQualityPosition());
+        result.setReceiveSamplingVideo(superviseUnloadInfo==null? null :orderInfoFeign.getReveiveSamplingVideo());
 
         //查询结算信息
         Optional<SettlementOwnerDetail> optional = settlementOwnerDetailDao.getByChildNo(childNo);