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()));