Commit 75dda45a6292e667f7092ed3a712dc57e7868534
1 parent
7657ece5
feat:一次性通过率,更新sgs测试与Aitex测试合并计算
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<OrderBaseInfoMapper, O | @@ -1996,10 +1996,21 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl<OrderBaseInfoMapper, O | ||
| 1996 | if(Objects.isNull(orderOpinionLogVO.getOrderId())){ | 1996 | if(Objects.isNull(orderOpinionLogVO.getOrderId())){ |
| 1997 | return ServerResult.fail("OrderId 参数不能为空"); | 1997 | return ServerResult.fail("OrderId 参数不能为空"); |
| 1998 | } | 1998 | } |
| 1999 | - List<OrderOpinionLogDO> orderOpinionLogDOList = orderOpinionLogService.list(new LambdaQueryWrapper<OrderOpinionLogDO>() | 1999 | + LambdaQueryWrapper<OrderOpinionLogDO> orderOpinionWrapper = new LambdaQueryWrapper<OrderOpinionLogDO>() |
| 2000 | .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN) | 2000 | .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN) |
| 2001 | - .eq(OrderOpinionLogDO::getOrderId, orderOpinionLogVO.getOrderId()) | ||
| 2002 | - .eq(OrderOpinionLogDO::getOpinionType, orderOpinionLogVO.getOpinionType())); | 2001 | + .eq(OrderOpinionLogDO::getOrderId, orderOpinionLogVO.getOrderId()); |
| 2002 | + if(!OrderOpinionLogEnum.ORDER_SGS_TEST_FINISH_RESULT.getDesc().equals(orderOpinionLogVO.getOpinionType()) && | ||
| 2003 | + !OrderOpinionLogEnum.ORDER_AITEX_TEST_FINISH_RESULT.getDesc().equals(orderOpinionLogVO.getOpinionType())){ | ||
| 2004 | + //不等于sgs和ailtex | ||
| 2005 | + orderOpinionWrapper.eq(OrderOpinionLogDO::getOpinionType, orderOpinionLogVO.getOpinionType()); | ||
| 2006 | + }else{ | ||
| 2007 | + orderOpinionWrapper.and(wrapper -> | ||
| 2008 | + wrapper.eq(OrderOpinionLogDO::getOpinionType, OrderOpinionLogEnum.ORDER_SGS_TEST_FINISH_RESULT.getDesc()) | ||
| 2009 | + .or() | ||
| 2010 | + .eq(OrderOpinionLogDO::getOpinionType, OrderOpinionLogEnum.ORDER_AITEX_TEST_FINISH_RESULT.getDesc()) | ||
| 2011 | + ); | ||
| 2012 | + } | ||
| 2013 | + List<OrderOpinionLogDO> orderOpinionLogDOList = orderOpinionLogService.list(orderOpinionWrapper); | ||
| 2003 | if(CollectionUtils.isEmpty(orderOpinionLogDOList)){ | 2014 | if(CollectionUtils.isEmpty(orderOpinionLogDOList)){ |
| 2004 | return ServerResult.fail("订单跟单信息"+orderOpinionLogVO.getOpinionType()+"未填写"); | 2015 | return ServerResult.fail("订单跟单信息"+orderOpinionLogVO.getOpinionType()+"未填写"); |
| 2005 | } | 2016 | } |