订单 订单sku 查询优化

sd-business/src/main/java/com/sd/business/entity/order/dto/OrderSelectDto.java

@@ -44,5 +44,9 @@ public class OrderSelectDto extends BaseSelectDto {
      */
     private Integer settlementStatus;
 
+    /**
+     * 是否关联对账单
+     */
+    private Integer linkedStatementOfAccount;
 
 }

sd-business/src/main/java/com/sd/business/entity/order/dto/OrderSkuSelectDto.java

@@ -54,4 +54,9 @@ public class OrderSkuSelectDto extends BaseSelectDto {
      */
     private String departmentName;
 
+    /**
+     * 事业部id
+     */
+    private Long departmentId;
+
 }

sd-business/src/main/java/com/sd/business/service/order/impl/OrderServiceImpl.java

@@ -86,6 +86,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
         wrapper.eq("o", OrderInfo::getSettlementStatus, dto.getSettlementStatus());
         wrapper.ge("o", OrderInfo::getWlnCreateTime, dto.getBeginTime());
         wrapper.le("o", OrderInfo::getWlnCreateTime, dto.getEndTime());
+        wrapper.isNull(Objects.equals(dto.getLinkedStatementOfAccount(), 0), "o.statement_of_account_id");
+        wrapper.isNotNull(Objects.equals(dto.getLinkedStatementOfAccount(), 1), "o.statement_of_account_id");
 
         Page<OrderInfoVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         return page;

sd-business/src/main/java/com/sd/business/service/order/impl/OrderSkuServiceImpl.java

@@ -30,7 +30,6 @@ public class OrderSkuServiceImpl extends ServiceImpl<OrderSkuMapper, OrderSku> i
     public Page<OrderSkuVo> getPage(OrderSkuSelectDto dto) {
         IWrapper<OrderSku> wrapper = getWrapper();
         wrapper.orderByDesc("os", OrderSku::getId);
-
         wrapper.like("oi", OrderInfo::getCode, dto.getOrderCode());
         wrapper.like("oi", OrderInfo::getWlnCode, dto.getOrderWlnCode());
         wrapper.like("d", Department::getName, dto.getDepartmentName());
@@ -39,13 +38,11 @@ public class OrderSkuServiceImpl extends ServiceImpl<OrderSkuMapper, OrderSku> i
         wrapper.like("bs", BomSpec::getCode, dto.getBomSpecCode());
         wrapper.like("bs", BomSpec::getName, dto.getBomSpecName());
         wrapper.eq("oi", OrderInfo::getStatus, dto.getOrderStatus());
-
+        wrapper.eq("oi", OrderInfo::getDepartmentId, dto.getDepartmentId());
         wrapper.ge("oi", OrderInfo::getWlnCreateTime, dto.getBeginTime());
         wrapper.le("oi", OrderInfo::getWlnCreateTime, dto.getEndTime());
 
-        Page<OrderSkuVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
-
-        return page;
+        return this.baseMapper.getPage(dto.getPage(), wrapper);
     }
 
 }