异常质检明细 问题处理

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/deliver/impl/DeliverGoodsServiceImpl.java

@@ -283,6 +283,7 @@ public class DeliverGoodsServiceImpl extends ServiceImpl<DeliverGoodsMapper, Del
             Map<Long, List<QualityDetailVo>> qualityDetailsMap = qualityInfoByPurchaseId.stream().collect(Collectors.groupingBy(QualityDetail::getBussinessId));
 
             for (PurchaseDetailVo purchaseDetailVo : purchaseDetailVoList) {
+                //根据产品id获取质检信息
                 List<QualityDetailVo> qualityDetails = qualityDetailsMap.get(purchaseDetailVo.getBussinessId());
                 if (ObjectUtil.isEmpty(qualityDetails)) {
                     purchaseDetailVo.setQualifiedCount(BigDecimal.ZERO);
@@ -301,6 +302,12 @@ public class DeliverGoodsServiceImpl extends ServiceImpl<DeliverGoodsMapper, Del
 
                 purchaseDetailVo.setIsReject(noQualifiedCount.compareTo(BigDecimal.ZERO) > 0 ? 1 : 0);
 
+                //过滤调质检数为0的明细数据 留下有质检数的数据
+                qualityDetails = qualityDetails.stream().filter(item->{
+                    BigDecimal add = item.getQualifiedCount().add(item.getNoQualifiedCount());
+                    return add.compareTo(BigDecimal.ZERO)!=0;
+                }).collect(Collectors.toList());
+
                 //赋值产品质检的明细
                 purchaseDetailVo.setQualityDetailsList(qualityDetails);
             }

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/quality/impl/QualityInfoServiceImpl.java

@@ -226,6 +226,12 @@ public class QualityInfoServiceImpl extends ServiceImpl<QualityInfoMapper, Quali
         qualityInfoDto.setBussinessId(qualityInfoDto.getArrivalStockRecordsId());
         //创建质检明细
         List<QualityDetails> qualityDetailsList = qualityInfoDto.getQualityDetailsList();
+        //过滤调质检数为0的明细数据 留下有质检数的数据
+        qualityDetailsList = qualityDetailsList.stream().filter(item->{
+            BigDecimal add = item.getQualifiedQuantity().add(item.getDisqualificationQuantity());
+            return add.compareTo(BigDecimal.ZERO)!=0;
+        }).collect(Collectors.toList());
+
         int qFlag = 0;//质检存在不合格标志
         for (QualityDetails qualityDetails : qualityDetailsList) {
             qualityDetails.setId(null);//将明细id置空解决前端误传

hx-victoriatourist/src/main/resources/mapper/deliver/DeliverGoodsMapper.xml

@@ -41,8 +41,6 @@
         WHERE
             sw.business_id = #{id}
           and sw.del_flag = 0
-        GROUP BY
-            qd.product_info_id
     </select>
 
 </mapper>