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

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

@@ -437,9 +437,7 @@ public class OrderExceptionServiceImpl extends AbstractService<OrderExceptionMap
         if (StringUtils.isNotBlank(reqVo.getConsignor())) {
             queryWrapper.eq("r.customer_id", reqVo.getConsignor());
         }
-        if (StringUtils.isNotBlank(reqVo.getProductRecord())) {
-            queryWrapper.eqIfPresent("o.product_record", reqVo.getProductRecord());
-        }
+
         queryWrapper.eq(StrUtil.isNotBlank(reqVo.getSalesmanId()), "o.salesman_id", reqVo.getSalesmanId());
 
         if (null != reqVo.getCustomerIds() && reqVo.getCustomerIds().size() > 0) {
@@ -494,6 +492,9 @@ public class OrderExceptionServiceImpl extends AbstractService<OrderExceptionMap
         //商品类型
         queryWrapper.in(null != reqVo.getGoodsTypes(), "m.prod_type", reqVo.getGoodsTypes());
 
+        //备案
+        queryWrapper.in(null != reqVo.getProductRecords(), "o.product_record", reqVo.getProductRecords());
+
         queryWrapper.orderByDesc("e.id");
 
         return orderExceptionMapper.getOrderExceptionExcelList(queryWrapper, reqVo.getOrderExceptionType(), startTime, endTime);
@@ -2537,9 +2538,6 @@ public class OrderExceptionServiceImpl extends AbstractService<OrderExceptionMap
         if (StringUtils.isNotBlank(reqVo.getConsignor())) {
             queryWrapper.eq("oc.customer_id", reqVo.getConsignor());
         }
-        if (StringUtils.isNotBlank(reqVo.getProductRecord())) {
-            queryWrapper.eqIfPresent("a.product_record", reqVo.getProductRecord());
-        }
 
         //queryWrapper.eq(StrUtil.isNotBlank(reqVo.getSalesmanId()), "a.salesman_id", reqVo.getSalesmanId());
         if (null != reqVo.getCustomerIds() && reqVo.getCustomerIds().size() > 0) {
@@ -2602,6 +2600,8 @@ public class OrderExceptionServiceImpl extends AbstractService<OrderExceptionMap
         queryWrapper.in(null != reqVo.getTypes(), "a.type", reqVo.getTypes());
         //商品类型
         queryWrapper.in(null != reqVo.getGoodsTypes(), "m.prod_type", reqVo.getGoodsTypes());
+        //备案
+        queryWrapper.in(null != reqVo.getProductRecords(), "a.product_record", reqVo.getProductRecords());
 
         queryWrapper.orderByDesc("b.id");
 
@@ -2668,9 +2668,6 @@ public class OrderExceptionServiceImpl extends AbstractService<OrderExceptionMap
         if (StringUtils.isNotBlank(reqVo.getConsignor())) {
             queryWrapper.eq("oc.customer_id", reqVo.getConsignor());
         }
-        if (StringUtils.isNotBlank(reqVo.getProductRecord())) {
-            queryWrapper.eqIfPresent("a.product_record", reqVo.getProductRecord());
-        }
 
         //queryWrapper.eq(StrUtil.isNotBlank(reqVo.getSalesmanId()), "a.salesman_id", reqVo.getSalesmanId());
         if (null != reqVo.getCustomerIds() && reqVo.getCustomerIds().size() > 0) {
@@ -2726,6 +2723,9 @@ public class OrderExceptionServiceImpl extends AbstractService<OrderExceptionMap
         //商品类型
         queryWrapper.in(null != reqVo.getGoodsTypes(), "m.prod_type", reqVo.getGoodsTypes());
 
+        //备案
+        queryWrapper.in(null != reqVo.getProductRecords(), "o.product_record", reqVo.getProductRecords());
+
         StatisticsOrderVO vo = orderExceptionMapper.statisticsExceptionOrder(queryWrapper, reqVo.getOrderExceptionType(), startTime, endTime);
         if (Objects.nonNull(vo)) {
             vo.setTotalVolume(new BigDecimal(vo.getTotalVolume()).setScale(2, RoundingMode.HALF_UP).toString());

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

@@ -53,8 +53,8 @@ public class OrderExceptionQueryVO {
     @ApiModelProperty(value = "发货人")
     private String consignor;
 
-    @ApiModelProperty(value = "备案")
-    private String productRecord;
+  /*  @ApiModelProperty(value = "备案")
+    private String productRecord;*/
 
     @ApiModelProperty(value = "1:入仓时间2:处理时间")
     private String dateType;
@@ -118,4 +118,7 @@ public class OrderExceptionQueryVO {
 
     @ApiModelProperty(value = "商品类型")
     private List<Long> goodsTypes;
+
+    @ApiModelProperty(value = "备案")
+    private List<Integer> productRecords;
 }