|
@@ -57,7 +57,10 @@ public class NeiYeController {
|
|
|
if(queryVO.getWbsIds() != null && queryVO.getWbsIds().size() > 0){
|
|
|
//生成列表
|
|
|
List<NeiYeLedgerVO> neiYeLedgerVOList = new ArrayList<>();
|
|
|
-
|
|
|
+ Integer contractType=1;
|
|
|
+ if (StringUtils.isNotBlank(queryVO.getContractIdRelation())){
|
|
|
+ contractType = 2;
|
|
|
+ }
|
|
|
ContractInfo contract = this.contractClient.getContractById(Long.parseLong(queryVO.getContractId()));
|
|
|
String contractId = contract.getId().toString();
|
|
|
if(!new Integer("1").equals(contract.getContractType())){
|
|
@@ -83,13 +86,13 @@ public class NeiYeController {
|
|
|
&& !node.getNodeName().contains("开工报告")&& !node.getNodeName().contains("质量检验评定表")){
|
|
|
//非填报节点
|
|
|
if (node.getParentId() == 0){
|
|
|
- queryDataResult = this.informationQueryService.queryProcessDataByParentIdAndContractIdTwo("", contract.getContractType(), contractId);
|
|
|
+ queryDataResult = this.informationQueryService.queryProcessDataByParentIdAndContractIdTwo("", contractType, contractId);
|
|
|
}else {
|
|
|
- queryDataResult = this.informationQueryService.queryProcessDataByParentIdAndContractIdTwo(node.getId().toString(), contract.getContractType(), contractId);
|
|
|
+ queryDataResult = this.informationQueryService.queryProcessDataByParentIdAndContractIdTwo(node.getId().toString(), contractType, contractId);
|
|
|
}
|
|
|
} else {
|
|
|
//填报节点
|
|
|
- queryDataResult = this.informationQueryService.queryProcessDataByPrimaryKeyIdAndClassify(node.getPKeyId().toString(), contract.getContractType());
|
|
|
+ queryDataResult = this.informationQueryService.queryProcessDataByPrimaryKeyIdAndClassify(node.getPKeyId().toString(),contractType);
|
|
|
}
|
|
|
|
|
|
if (queryDataResult != null && queryDataResult.size() > 0) {
|