|
@@ -441,11 +441,13 @@ public class FormulaController {
|
|
|
while (loop<max&&StringUtils.isNotEquals(0,parentId)){
|
|
|
WbsTreeContract next= this.wbsTreeContractService.getOne(Wrappers.<WbsTreeContract>lambdaQuery().eq(WbsTreeContract::getContractId,one.getContractId()).eq(WbsTreeContract::getId,parentId));
|
|
|
parentId=next.getParentId().toString();
|
|
|
- list.add(Func.isNotBlank(next.getFullName())?next.getFullName():next.getNodeName());
|
|
|
+ list.add(Func.isNotBlank(next.getNodeName())?next.getNodeName():next.getFullName());
|
|
|
loop++;
|
|
|
}
|
|
|
+ ContractInfo info= contractInfoService.getById(one.getContractId());
|
|
|
Collections.reverse(list);
|
|
|
- final String[] indent = {""};
|
|
|
+ list.set(0,info.getContractName());
|
|
|
+ final String[] indent = {"-"};
|
|
|
String result = list.stream()
|
|
|
.map(item -> {
|
|
|
String line = indent[0] + item;
|