未排单的板材生产单板材分页列表接口出入参修改

cf-framework/cf-spring-boot-starter-mybatis/src/main/java/com/cf/imes/framework/mybatis/core/query/QueryWrapperX.java

@@ -139,6 +139,12 @@ public class QueryWrapperX<T> extends QueryWrapper<T> {
         return this;
     }
 
+    @Override
+    public QueryWrapperX<T> isNull(String column) {
+        super.isNull(column);
+        return this;
+    }
+
     /**
      * 设置只返回最后一条
      *

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OrderPageReqVOCopy.java

@@ -7,6 +7,7 @@ import lombok.NoArgsConstructor;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
 
@@ -43,11 +44,15 @@ public class OrderPageReqVOCopy extends PageParam {
     private Boolean burrow;
     @Schema(description = "有二维纹路")
     private Boolean twoDimensionalToolPath;
-    @Schema(description = "开始时间")
+    @Schema(description = "创建时间", example = "[2022-07-01 00:00:00,2022-07-01 23:59:59]")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private Date beginDate;
+    private LocalDateTime[] createTime;
+    /*@Schema(description = "交付日期开始时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private Date endDate;
+    private LocalDateTime beginDate;
+    @Schema(description = "交付日期结束时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime endDate;*/
     @Schema(description = "长 小范围")
     private BigDecimal longMinRang;
     @Schema(description = "长 大范围")

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OrderRespVOCopy.java

@@ -30,6 +30,9 @@ public class OrderRespVOCopy {
     private String customer;
     @Schema(description = "地址")
     private String address;
+    @Schema(description = "订单日期")
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = TIME_ZONE_DEFAULT)
+    private Date orderDate;
     @Schema(description = "交付日期")
     @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = TIME_ZONE_DEFAULT)
     private Date deliveryDate;

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java

@@ -34,6 +34,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -242,11 +243,14 @@ public class PlanServiceImpl implements PlanService {
 
         QueryWrapperX<OrderDO> queryWrapperX = new QueryWrapperX<>();
         queryWrapperX
+                .isNull("opi.id")
                 .eqIfPresent("customer", pageReqVO.getConsignee())
+                .eqIfPresent("custom_order_no", pageReqVO.getDefaultId())
                 .eqIfPresent("address", pageReqVO.getConsigneeAddress())
                 .eqIfPresent("custom_order_no", pageReqVO.getDefaultId())
-                .betweenIfPresent("delivery_date", new Date[]{pageReqVO.getBeginDate(), pageReqVO.getEndDate()})
-                .isNull("d.order_id")
+                .betweenIfPresent("a.create_time", pageReqVO.getCreateTime())
+                .betweenIfPresent("op.height", new BigDecimal[]{pageReqVO.getLongMinRang(), pageReqVO.getLongMaxRang()})
+                .betweenIfPresent("op.width", new BigDecimal[]{pageReqVO.getWidthMinRang(), pageReqVO.getWidthMaxRang()} )
         ;
         List<Integer> filterTypes = new ArrayList<>();
         if (Objects.nonNull(pageReqVO.getHoleThrough()) && pageReqVO.getHoleThrough()) {
@@ -259,7 +263,7 @@ public class PlanServiceImpl implements PlanService {
             filterTypes.add(4);
         }
 
-        queryWrapperX.inIfPresent("c.filter_type", filterTypes);
+        queryWrapperX.inIfPresent("op.filter_type", filterTypes);
 
         IPage<OrderRespVOCopy> orderDOPageResult = orderMapper.selectOrderPage(page, queryWrapperX);
         if (CollectionUtil.isEmpty(orderDOPageResult.getRecords())) {

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderMapper.xml

@@ -4,14 +4,16 @@
 
     <select id="selectOrderPage" resultType="com.cf.imes.module.executor.controller.admin.plan.vo.OrderRespVOCopy">
         select a.id as orderId, a.order_date, a.delivery_date, a.customer, a.address, a.custom_order_no as defineId,
-        count(c.id) as num, sum(c.area) as area, p.goods_name, p.color, p.material, p.goods_id
+               og.goods_name, og.color, og.material, op.goods_id, count(op.id) as num, sum(op.area) as area
         from `order` a
-        left join order_plate c ON a.id = c.order_id and c.is_cancel = 0
-        left join order_goods p on c.goods_id = p.goods_id
-        left join order_item d ON c.order_id = d.order_id
-        left join order_plan_item e on d.id = e.item_id
+        inner join order_plate op on a.id = op.order_id and op.is_cancel = 0
+        inner join order_goods og on op.goods_id = og.goods_id
+        left join order_item oi on a.id = oi.order_id
+        left join order_plan_item opi on oi.id = opi.item_id
         ${ew.customSqlSegment}
-        group by orderId, p.id
+        group by a.id, og.id
+
+
     </select>
 
     <select id="selectDynamicSqlString" resultType="java.util.Map">