异常订单备案查询条件错误

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/dal/mysql/orderException/OrderExceptionMapper.java

@@ -5,8 +5,6 @@ import cn.iocoder.yudao.framework.mybatis.core.mapper.AbstractMapper;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQuery;
 import cn.iocoder.yudao.framework.mybatis.core.vo.PageVO;
 import cn.iocoder.yudao.module.order.dal.dataobject.orderException.OrderExceptionDO;
-import cn.iocoder.yudao.module.order.vo.order.OrderBackPageVO;
-import cn.iocoder.yudao.module.order.vo.order.OrderQueryVO;
 import cn.iocoder.yudao.module.order.vo.order.StatisticsOrderVO;
 import cn.iocoder.yudao.module.order.vo.orderException.OrderBackVO;
 import cn.iocoder.yudao.module.order.vo.orderException.OrderExceptionBackVO;
@@ -17,7 +15,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.ResultType;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
@@ -40,7 +37,7 @@ public interface OrderExceptionMapper extends AbstractMapper<OrderExceptionDO> {
                     //.eqIfPresent(OrderExceptionDO::getOrderExceptionRemark, vo.getOrderExceptionRemark())
                     //.eqIfPresent(OrderExceptionDO::getOrderExceptionAmount, vo.getOrderExceptionAmount())
                     //.eqIfPresent(OrderExceptionDO::getOrderExceptionAttr, vo.getOrderExceptionAttr())
-                    .eqIfPresent(OrderExceptionDO::getOrderExceptionStatus, vo.getOrderExceptionStatus())
+                    .eqIfPresent(OrderExceptionDO::getOrderExceptionStatus, vo.getOrderExceptionStatusList())
                     .betweenIfPresent(OrderExceptionDO::getCreateTime, vo.getBeginCreateTime(), vo.getEndCreateTime())
                     .orderByDesc(OrderExceptionDO::getId));
         }
@@ -56,7 +53,7 @@ public interface OrderExceptionMapper extends AbstractMapper<OrderExceptionDO> {
                     .eqIfPresent(OrderExceptionDO::getOrderId, vo.getOrderId())
                     //.eqIfPresent(OrderExceptionDO::getOrderNumber, vo.getOrderNumber())
                     .eqIfPresent(OrderExceptionDO::getOrderExceptionType, vo.getOrderExceptionType())
-                    .eqIfPresent(OrderExceptionDO::getOrderExceptionStatus, vo.getOrderExceptionStatus())
+                    .eqIfPresent(OrderExceptionDO::getOrderExceptionStatus, vo.getOrderExceptionStatusList())
                     .betweenIfPresent(OrderExceptionDO::getCreateTime, vo.getBeginCreateTime(), vo.getEndCreateTime())
                     .orderByDesc(OrderExceptionDO::getId));
         }

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/orderException/OrderExceptionServiceImpl.java

@@ -433,7 +433,7 @@ public class OrderExceptionServiceImpl extends AbstractService<OrderExceptionMap
             queryWrapper.inIfPresent("e.order_exception_type", reqVo.getOrderExceptionType());
         }
 
-        queryWrapper.eqIfPresent("tot.order_exception_status", reqVo.getOrderExceptionStatus());
+        queryWrapper.inIfPresent("tot.order_exception_status", reqVo.getOrderExceptionStatusList());
         if (StringUtils.isNotBlank(reqVo.getConsignor())) {
             queryWrapper.eq("r.customer_id", reqVo.getConsignor());
         }
@@ -2534,7 +2534,7 @@ public class OrderExceptionServiceImpl extends AbstractService<OrderExceptionMap
             queryWrapper.inIfPresent("eo.objective_country_id", reqVo.getDestCountryIds());
         }
 
-        queryWrapper.eqIfPresent("s.order_exception_status", reqVo.getOrderExceptionStatus());
+        queryWrapper.inIfPresent("s.order_exception_status", reqVo.getOrderExceptionStatusList());
         if (StringUtils.isNotBlank(reqVo.getConsignor())) {
             queryWrapper.eq("oc.customer_id", reqVo.getConsignor());
         }
@@ -2664,7 +2664,7 @@ public class OrderExceptionServiceImpl extends AbstractService<OrderExceptionMap
             queryWrapper.inIfPresent("eo.objective_country_id", reqVo.getDestCountryIds());
         }
 
-        queryWrapper.eqIfPresent("s.order_exception_status", reqVo.getOrderExceptionStatus());
+        queryWrapper.inIfPresent("s.order_exception_status", reqVo.getOrderExceptionStatusList());
         if (StringUtils.isNotBlank(reqVo.getConsignor())) {
             queryWrapper.eq("oc.customer_id", reqVo.getConsignor());
         }

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/orderException/OrderExceptionQueryVO.java

@@ -48,7 +48,7 @@ public class OrderExceptionQueryVO {
     private List<String> orderExceptionType;
 
     @ApiModelProperty(value = "异常状态")
-    private Integer orderExceptionStatus;
+    private List<Integer> orderExceptionStatusList;
 
     @ApiModelProperty(value = "发货人")
     private String consignor;