Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-14 13:42:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

装配清单-顶级部件列表支持多订单查询

Browse Source
This commit is contained in:
gaoqr
2026-03-06 10:54:27 +08:00
parent 5d8e7be601
commit f19b53c0f2
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/ordercomponent/vo/OrderDetailComponentListReqVO.java
+7
View File
@@ -10,7 +10,9 @@ import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import lombok.ToString; import lombok.ToString;
import org.hibernate.validator.constraints.Length;
import java.util.List;
import java.util.Set; import java.util.Set;
/** /**
@@ -30,6 +32,10 @@ public class OrderDetailComponentListReqVO {
@NotNull(message = "{order.detail.component.list.query.orderId.not.null}") @NotNull(message = "{order.detail.component.list.query.orderId.not.null}")
private Long orderId; private Long orderId;
@Schema(description = "订单编号列表", example = "[1,2]")
@Size(max = 100, message = "{order.component.assemble.req.orderIds.max}")
private List<Long> orderIds;
@Schema(description = "房间编号", example = "[1,2]") @Schema(description = "房间编号", example = "[1,2]")
@Size(max = 200, message = "{order.detail.component.list.query.roomIds.max}") @Size(max = 200, message = "{order.detail.component.list.query.roomIds.max}")
private Set<Long> roomIds; private Set<Long> roomIds;
@@ -43,6 +49,7 @@ public class OrderDetailComponentListReqVO {
private Set<Long> componentIds; private Set<Long> componentIds;
@Schema(description = "部件名称", example = "部件") @Schema(description = "部件名称", example = "部件")
@Length(max = 64, message = "{order.component.assemble.req.name.max}")
private String name; private String name;
@Schema(description = "是否删除", example = "false") @Schema(description = "是否删除", example = "false")
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/ordercomponent/OrderComponentServiceImpl.java
+5 -1
View File
@@ -127,8 +127,12 @@ public class OrderComponentServiceImpl implements OrderComponentService {
@Override @Override
public List<OrderComponentRespVO> getOrderTopComponentList(OrderDetailComponentListReqVO reqVO) { public List<OrderComponentRespVO> getOrderTopComponentList(OrderDetailComponentListReqVO reqVO) {
List<Long> orderIds = reqVO.getOrderIds();
if (CollUtil.isEmpty(orderIds)) {
return Collections.emptyList();
}
List<OrderComponentDO> orderComponentDOS = orderComponentMapper.selectList(new LambdaQueryWrapperX<OrderComponentDO>() List<OrderComponentDO> orderComponentDOS = orderComponentMapper.selectList(new LambdaQueryWrapperX<OrderComponentDO>()
.eq(OrderComponentDO::getOrderId, reqVO.getOrderId()) .in(OrderComponentDO::getOrderId, orderIds)
.eq(OrderComponentDO::getPid, OrderComponentDO.PARENT_ID_ROOT) .eq(OrderComponentDO::getPid, OrderComponentDO.PARENT_ID_ROOT)
.likeIfPresent(OrderComponentDO::getName, reqVO.getName()) .likeIfPresent(OrderComponentDO::getName, reqVO.getName())
.eqIfPresent(OrderComponentDO::getProcessStatus, reqVO.getProcessStatus())); .eqIfPresent(OrderComponentDO::getProcessStatus, reqVO.getProcessStatus()));