feat:一次性通过率,更新sgs测试与Aitex测试合并计算

chenhang4442024
1 parent 7657ece5
Showing 1 changed file with 14 additions and 3 deletions
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
@@ -1996,10 +1996,21 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
         if(Objects.isNull(orderOpinionLogVO.getOrderId())){
             return ServerResult.fail("OrderId 参数不能为空");
         }
-        List<OrderOpinionLogDO> orderOpinionLogDOList = orderOpinionLogService.list(new LambdaQueryWrapper<OrderOpinionLogDO>()
+        LambdaQueryWrapper<OrderOpinionLogDO> orderOpinionWrapper = new LambdaQueryWrapper<OrderOpinionLogDO>()
                 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
-                .eq(OrderOpinionLogDO::getOrderId, orderOpinionLogVO.getOrderId())
-                .eq(OrderOpinionLogDO::getOpinionType, orderOpinionLogVO.getOpinionType()));
+                .eq(OrderOpinionLogDO::getOrderId, orderOpinionLogVO.getOrderId());
+                if(!OrderOpinionLogEnum.ORDER_SGS_TEST_FINISH_RESULT.getDesc().equals(orderOpinionLogVO.getOpinionType()) &&
+                        !OrderOpinionLogEnum.ORDER_AITEX_TEST_FINISH_RESULT.getDesc().equals(orderOpinionLogVO.getOpinionType())){
+                    //不等于sgs和ailtex
+                orderOpinionWrapper.eq(OrderOpinionLogDO::getOpinionType, orderOpinionLogVO.getOpinionType());
+                }else{
+                    orderOpinionWrapper.and(wrapper ->
+                            wrapper.eq(OrderOpinionLogDO::getOpinionType, OrderOpinionLogEnum.ORDER_SGS_TEST_FINISH_RESULT.getDesc())
+                                    .or()
+                                    .eq(OrderOpinionLogDO::getOpinionType, OrderOpinionLogEnum.ORDER_AITEX_TEST_FINISH_RESULT.getDesc())
+                    );
+                }
+        List<OrderOpinionLogDO> orderOpinionLogDOList = orderOpinionLogService.list(orderOpinionWrapper);
         if(CollectionUtils.isEmpty(orderOpinionLogDOList)){
             return ServerResult.fail("订单跟单信息"+orderOpinionLogVO.getOpinionType()+"未填写");
         }