Skip to content

T
traffic-front
Commit 93b75c6c authored by neo.wang's avatar neo.wang
Browse files
Options

Merge branch 'dev_neo' into 'dev' 

Dev neo

See merge request root/atms!88
parents 794ccd79 a391e4aa
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
atms-api/src/main/java/pwc/taxtech/atms/controller/TBDataImportController.java
View file @ 93b75c6c
...@@ -245,6 +245,7 @@ public class TBDataImportController { ...@@ -245,6 +245,7 @@ public class TBDataImportController {
private void initTree(List<JsonTrialBalanceTreeNode> nodes, String parentCode, List<JsonTrialBalanceTreeNode> sources) { private void initTree(List<JsonTrialBalanceTreeNode> nodes, String parentCode, List<JsonTrialBalanceTreeNode> sources) {
JsonTrialBalanceTreeNode tempNode; JsonTrialBalanceTreeNode tempNode;
//递归寻找子节点 //递归寻找子节点
if (sources != null && !sources.isEmpty()) {
List<JsonTrialBalanceTreeNode> tempTree = sources.stream().filter(item -> item.getParentCode().equals(parentCode)).collect(Collectors.toList()); List<JsonTrialBalanceTreeNode> tempTree = sources.stream().filter(item -> item.getParentCode().equals(parentCode)).collect(Collectors.toList());
for (JsonTrialBalanceTreeNode row : tempTree) { for (JsonTrialBalanceTreeNode row : tempTree) {
tempNode = new JsonTrialBalanceTreeNode(); tempNode = new JsonTrialBalanceTreeNode();
...@@ -254,6 +255,7 @@ public class TBDataImportController { ...@@ -254,6 +255,7 @@ public class TBDataImportController {
initTree(tempNode.getChildren(), row.getAcctCode(), sources); initTree(tempNode.getChildren(), row.getAcctCode(), sources);
} }
} }
}
private static List<TrialBalanceDto> filterTrialBalanceList(TrialBalanceFilter filter, List<TrialBalanceDto> balanceList) { private static List<TrialBalanceDto> filterTrialBalanceList(TrialBalanceFilter filter, List<TrialBalanceDto> balanceList) {
// Account Code: support multiple codes seperated by space: // Account Code: support multiple codes seperated by space:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment