mirror of
http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git
synced 2026-08-14 13:42:07 +08:00
订单详情三维看图部件所有板件接口补充cadViewFileId修复
This commit is contained in:
+2
-3
@@ -253,7 +253,7 @@ public class OrderComponentServiceImpl implements OrderComponentService {
|
|||||||
.in(OrderComponentDO::getTopId, topIds)
|
.in(OrderComponentDO::getTopId, topIds)
|
||||||
.eq(OrderComponentDO::getOrderId, orderId)
|
.eq(OrderComponentDO::getOrderId, orderId)
|
||||||
.eqIfPresent(OrderComponentDO::getDeleted, pageReqVO.isDeleted())
|
.eqIfPresent(OrderComponentDO::getDeleted, pageReqVO.isDeleted())
|
||||||
.select(OrderComponentDO::getId));
|
.select(OrderComponentDO::getId, OrderComponentDO::getCadViewFileId));
|
||||||
if (CollUtil.isNotEmpty(orderComponentDOS)) {
|
if (CollUtil.isNotEmpty(orderComponentDOS)) {
|
||||||
componentIds = orderComponentDOS.stream().map(OrderComponentDO::getId).collect(Collectors.toSet());
|
componentIds = orderComponentDOS.stream().map(OrderComponentDO::getId).collect(Collectors.toSet());
|
||||||
} else {
|
} else {
|
||||||
@@ -269,10 +269,9 @@ public class OrderComponentServiceImpl implements OrderComponentService {
|
|||||||
IPage<OrderBodyViewPlatesPageDO> viewPlatesPage = orderItemMapper.selectBodyViewPlatesPage(page, orderId, null,
|
IPage<OrderBodyViewPlatesPageDO> viewPlatesPage = orderItemMapper.selectBodyViewPlatesPage(page, orderId, null,
|
||||||
null, componentIds, true);
|
null, componentIds, true);
|
||||||
List<OrderBodyViewPlatesPageDO> records = viewPlatesPage.getRecords();
|
List<OrderBodyViewPlatesPageDO> records = viewPlatesPage.getRecords();
|
||||||
long total = viewPlatesPage.getTotal();
|
|
||||||
|
|
||||||
List<OrderViewPlatePageRespVO> resultList = new ArrayList<>();
|
List<OrderViewPlatePageRespVO> resultList = new ArrayList<>();
|
||||||
if(total > 0) {
|
if(CollUtil.isNotEmpty(records)) {
|
||||||
resultList = records.stream().map(item -> {
|
resultList = records.stream().map(item -> {
|
||||||
OrderViewPlatePageRespVO vo = new OrderViewPlatePageRespVO();
|
OrderViewPlatePageRespVO vo = new OrderViewPlatePageRespVO();
|
||||||
BeanUtil.copyProperties(item, vo);
|
BeanUtil.copyProperties(item, vo);
|
||||||
|
|||||||
Reference in New Issue
Block a user