From b6a67406e72bbee6246bab6c0b35a28223e57bc5 Mon Sep 17 00:00:00 2001 From: yangsb Date: Mon, 29 Apr 2024 14:48:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E5=8D=95=E4=B8=AD=E5=B0=8F=E6=9D=BF?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=B7=BB=E5=8A=A0=E5=BC=82=E6=80=A7=E3=80=81?= =?UTF-8?q?=E9=80=A0=E5=9E=8B=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/plan/vo/OrderPageReqVOCopy.java | 6 ++++-- .../imes/module/executor/service/plan/PlanServiceImpl.java | 5 +++++ 2 files changed, 9 insertions(+), 2 deletions(-) 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 aa848e0ec..2afba1064 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 @@ -32,8 +32,8 @@ public class OrderPageReqVOCopy extends PageParam { private String consigneeAddress; @Schema(description = "状态列表") private List stateList; - @Schema(description = "矩形") - private Boolean rectangle; + /*@Schema(description = "矩形") + private Boolean rectangle;*/ @Schema(description = "异形") private Boolean specialShaped; @Schema(description = "造型") @@ -44,6 +44,8 @@ public class OrderPageReqVOCopy extends PageParam { private Boolean burrow; @Schema(description = "有二维纹路") private Boolean twoDimensionalToolPath; + @Schema(description = "门板") + private Boolean isDoor; @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 LocalDateTime[] createTime; 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 f7d4aadb9..576b8df2d 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 @@ -249,6 +249,9 @@ public class PlanServiceImpl implements PlanService { .eqIfPresent("address", pageReqVO.getConsigneeAddress()) .eqIfPresent("custom_order_no", pageReqVO.getDefaultId()) .betweenIfPresent("a.create_time", pageReqVO.getCreateTime()) + .eqIfPresent("op.is_special_shaped", pageReqVO.getSpecialShaped()) + .eqIfPresent("op.is_sculpt", pageReqVO.getSculpt()) + .eqIfPresent("op.is_door", pageReqVO.getIsDoor()) .betweenIfPresent("op.height", new BigDecimal[]{pageReqVO.getLongMinRang(), pageReqVO.getLongMaxRang()}) .betweenIfPresent("op.width", new BigDecimal[]{pageReqVO.getWidthMinRang(), pageReqVO.getWidthMaxRang()} ) ; @@ -336,6 +339,8 @@ public class PlanServiceImpl implements PlanService { queryWrapperX.eq("p.plan_id", vo.getPlanId()) .eqIfPresent("a.is_door", vo.getIsDoor()) + .eqIfPresent("a.is_special_shaped", vo.getSpecialShaped()) + .eqIfPresent("a.is_sculpt", vo.getSculpt()) .betweenIfPresent("a.width", new BigDecimal[]{vo.getWidthMinRang(), vo.getWidthMaxRang()}) .betweenIfPresent("a.height", new BigDecimal[]{vo.getLongMinRang(), vo.getLongMaxRang()}) .inIfPresent("a.filter_type", filterTypes)