From 698bd77e1c2d2e5e31b4f1803b1317019151ba85 Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Tue, 9 Jun 2026 10:32:27 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A6=85=E9=81=93bug#1625=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../executor/controller/admin/plan/vo/OrderPageReqVOCopy.java | 3 +++ .../cf/imes/module/executor/service/plan/PlanServiceImpl.java | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OrderPageReqVOCopy.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OrderPageReqVOCopy.java index ccf0bfe46..470ff0fb5 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OrderPageReqVOCopy.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OrderPageReqVOCopy.java @@ -30,6 +30,9 @@ public class OrderPageReqVOCopy extends PageParam { @Length(max = 32,message = "自定义单号数据过长，请重新输入") private String defaultId; + @Schema(description = "订单类型") + private Integer orderType; + @Schema(description = "客户") @Length(max = 255, message = "客户数据过长，请重新输入") private String consignee; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java index ebfb1431d..2b6818c40 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java @@ -144,6 +144,7 @@ public class PlanServiceImpl implements PlanService { // 重复使用的常量 private static final String FIELD_ORDER_ID = "o.id"; + private static final String FIELD_ORDER_TYPE = "o.order_type"; private static final String FIELD_OP_IS_SPECIAL_SHAPED = "op.is_special_shaped"; private static final String FIELD_PLANID = "planId"; private static final String FIELD_ORGAN_ID = "o.organ_id"; @@ -568,7 +569,8 @@ public class PlanServiceImpl implements PlanService { .likeIfPresent(FIELD_CUSTOMER, pageReqVO.getConsignee()) .likeIfPresent(FIELD_CUSTOM_ORDER_NO, pageReqVO.getDefaultId()) .likeIfPresent(FIELD_ADDRESS, pageReqVO.getConsigneeAddress()) - .betweenIfPresent(FIELD_ORDER_DATE, LocalDateTimeUtils.generateTimeSection(pageReqVO.getCreateTime())); + .betweenIfPresent(FIELD_ORDER_DATE, LocalDateTimeUtils.generateTimeSection(pageReqVO.getCreateTime())) + .eqIfPresent(FIELD_ORDER_TYPE, pageReqVO.getOrderType()); PageDTO page = new PageDTO<>(pageReqVO.getPageNo(), pageReqVO.getPageSize()); // 查询满足未排单条件的顶级订单id