|
@@ -84,14 +84,14 @@ public class NeiYeController {
|
|
|
String contractI = node.getContractId();
|
|
|
List<WbsTreeContract> treeS = wbsTreeContractClient.getContractWbsTreeByParentId(node.getId().toString(),contractI);
|
|
|
for (WbsTreeContract tree : treeS) {
|
|
|
- List<QueryProcessDataVO> dataResult = this.informationQueryService.queryProcessDataByParentIdAndContractId(tree.getId().toString(), contract.getContractType(), contractId);
|
|
|
+ List<QueryProcessDataVO> dataResult = this.informationQueryService.queryProcessDataByParentIdAndContractIdTwo(tree.getId().toString(), contract.getContractType(), contractId);
|
|
|
if (dataResult != null && dataResult.size() > 0) {
|
|
|
queryDataResult.addAll(dataResult);
|
|
|
dataResult.clear();
|
|
|
}
|
|
|
}
|
|
|
}else {
|
|
|
- queryDataResult = this.informationQueryService.queryProcessDataByParentIdAndContractId(node.getId().toString(), contract.getContractType(), contractId);
|
|
|
+ queryDataResult = this.informationQueryService.queryProcessDataByParentIdAndContractIdTwo(node.getId().toString(), contract.getContractType(), contractId);
|
|
|
}
|
|
|
} else {
|
|
|
//填报节点
|