|
|
@@ -1604,6 +1604,11 @@ public class InformationWriteQueryController extends BladeController {
|
|
|
submitNodeKeyIds.add(vo.getWbsId().toString());
|
|
|
//查询当前节点下的所有填报节点
|
|
|
WbsTreeContract node = this.wbsTreeContractClient.getContractWbsTreeByPrimaryKeyId(vo.getWbsId());
|
|
|
+ if(node == null){
|
|
|
+ //这一步主要是为了兼容监理合同段
|
|
|
+ node = this.wbsTreeContractClient.getContractWbsTreeByContractIdAndId(vo.getWbsId(), Long.parseLong(vo.getContractIdRelation()));
|
|
|
+ }
|
|
|
+
|
|
|
if(!new Integer("6").equals(node.getDeptCategory()) && !Arrays.asList("1,2,3,4".split(",")).contains(node.getMajorDataType().toString())){
|
|
|
//不是工序，则查询当前节点下的所有填报节点
|
|
|
List<QueryProcessDataVO> queryDataResult = this.informationQueryService.queryProcessDataByParentIdAndContractId(node.getId().toString(), contract.getContractType(), StringUtils.isNotEmpty(vo.getContractIdRelation()) ? vo.getContractIdRelation() : vo.getContractId().toString());
|
|
|
@@ -1785,7 +1790,6 @@ public class InformationWriteQueryController extends BladeController {
|
|
|
if(new Integer("2").equals(contractInfo.getContractType())){
|
|
|
//监理合同段，需要获取关联的施工方合同段根节点数据
|
|
|
rootTreeNode = this.wbsTreeContractClient.lazyTree(StringUtils.isNotEmpty(parentId) ? Long.parseLong(parentId) : 0, contractId, contractIdRelation, contractInfo.getContractType());
|
|
|
- int i = 0;
|
|
|
} else {
|
|
|
if(com.alibaba.nacos.common.utils.StringUtils.isEmpty(parentId)){
|
|
|
//为空，说明初始化
|
huangjn