From f19b53c0f24383753e138b23dd0d8447eea9eaa4 Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Fri, 6 Mar 2026 10:54:27 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E9=85=8D=E6=B8=85=E5=8D=95-=E9=A1=B6?= =?UTF-8?q?=E7=BA=A7=E9=83=A8=E4=BB=B6=E5=88=97=E8=A1=A8=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E5=A4=9A=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ordercomponent/vo/OrderDetailComponentListReqVO.java | 7 +++++++ .../service/ordercomponent/OrderComponentServiceImpl.java | 6 +++++- 2 files changed, 12 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/ordercomponent/vo/OrderDetailComponentListReqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/ordercomponent/vo/OrderDetailComponentListReqVO.java index fd48d5820..5033d9298 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/ordercomponent/vo/OrderDetailComponentListReqVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/ordercomponent/vo/OrderDetailComponentListReqVO.java @@ -10,7 +10,9 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import lombok.ToString; +import org.hibernate.validator.constraints.Length; +import java.util.List; import java.util.Set; /** @@ -30,6 +32,10 @@ public class OrderDetailComponentListReqVO { @NotNull(message = "{order.detail.component.list.query.orderId.not.null}") private Long orderId; + @Schema(description = "订单编号列表", example = "[1,2]") + @Size(max = 100, message = "{order.component.assemble.req.orderIds.max}") + private List orderIds; + @Schema(description = "房间编号", example = "[1,2]") @Size(max = 200, message = "{order.detail.component.list.query.roomIds.max}") private Set roomIds; @@ -43,6 +49,7 @@ public class OrderDetailComponentListReqVO { private Set componentIds; @Schema(description = "部件名称", example = "部件") + @Length(max = 64, message = "{order.component.assemble.req.name.max}") private String name; @Schema(description = "是否删除", example = "false") diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/ordercomponent/OrderComponentServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/ordercomponent/OrderComponentServiceImpl.java index 248abe283..eff7891e5 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/ordercomponent/OrderComponentServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/ordercomponent/OrderComponentServiceImpl.java @@ -127,8 +127,12 @@ public class OrderComponentServiceImpl implements OrderComponentService { @Override public List getOrderTopComponentList(OrderDetailComponentListReqVO reqVO) { + List orderIds = reqVO.getOrderIds(); + if (CollUtil.isEmpty(orderIds)) { + return Collections.emptyList(); + } List orderComponentDOS = orderComponentMapper.selectList(new LambdaQueryWrapperX() - .eq(OrderComponentDO::getOrderId, reqVO.getOrderId()) + .in(OrderComponentDO::getOrderId, orderIds) .eq(OrderComponentDO::getPid, OrderComponentDO.PARENT_ID_ROOT) .likeIfPresent(OrderComponentDO::getName, reqVO.getName()) .eqIfPresent(OrderComponentDO::getProcessStatus, reqVO.getProcessStatus()));