From c0a9f70dc2192da1f5e7c9d5a4d02c258ef9b003 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期三, 08 四月 2026 17:18:20 +0800
Subject: [PATCH] feat(product-structure): 新增按父节点筛选的产品结构查询接口
---
src/main/java/com/ruoyi/production/service/impl/SalesLedgerProductionAccountingServiceImpl.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/SalesLedgerProductionAccountingServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/SalesLedgerProductionAccountingServiceImpl.java
index 7e5f58b..a1e9c9c 100644
--- a/src/main/java/com/ruoyi/production/service/impl/SalesLedgerProductionAccountingServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/SalesLedgerProductionAccountingServiceImpl.java
@@ -1,5 +1,6 @@
package com.ruoyi.production.service.impl;
+import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -14,9 +15,13 @@
import com.ruoyi.production.service.SalesLedgerProductionAccountingService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.tuple.Pair;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
/**
* @author :yys
@@ -56,7 +61,21 @@
salesLedgerProductionAccountingDto.setEntryDateStart(null);
salesLedgerProductionAccountingDto.setEntryDateEnd(null);
}
- return salesLedgerProductionAccountingMapper.pageProductionAccounting(page, salesLedgerProductionAccountingDto);
+ IPage<SalesLedgerProductionAccountingDto> salesLedgerProductionAccountingDtoIPage = salesLedgerProductionAccountingMapper.pageProductionAccounting(page, salesLedgerProductionAccountingDto);
+ salesLedgerProductionAccountingDtoIPage.getRecords().forEach(it->{
+ // 鎷垮埌鏈哄彴缁熻 鍒嗛挓-鏈哄彴, 杩欐牱鎺掑垪
+ String deviceWorkInfo = it.getDeviceWorkInfo();
+ List<String> str = StrUtil.split(deviceWorkInfo, ">>>");
+ List<Pair<String,Integer>> collect = str.stream().map(n1 -> {
+ List<String> strPair = StrUtil.split(n1, "|$|");
+ if (strPair.size() == 2) {
+ return Pair.of(strPair.get(1),Integer.parseInt(strPair.get(0)));
+ }
+ return null;
+ }).filter(Objects::nonNull).collect(Collectors.toList());
+ it.setDeviceWorkInfoPairList(collect);
+ });
+ return salesLedgerProductionAccountingDtoIPage;
}
@Override
--
Gitblit v1.9.3