|
@@ -125,9 +125,12 @@ public class NeiYeController {
|
|
|
}
|
|
|
//不是工序,则查询当前节点下的所有填报节点
|
|
|
List<QueryProcessDataVO> queryDataResult;
|
|
|
+ //本身就是工序节点就查本节点
|
|
|
+ if(node.getNodeType() == 6){
|
|
|
+ queryVO.setSelectType(2);
|
|
|
+ }
|
|
|
//有些填报节点的MajorDataType为0
|
|
|
- if (!new Integer("6").equals(node.getNodeType()) && (ObjectUtil.isEmpty(node.getMajorDataType()) || !Arrays.asList("1,2,3,4".split(",")).contains(node.getMajorDataType().toString()))
|
|
|
- && !node.getNodeName().contains("开工报告") && !node.getNodeName().contains("质量检验评定表")) {
|
|
|
+ if (queryVO.getSelectType() == 1) {
|
|
|
//非填报节点
|
|
|
if (node.getParentId() == 0) {
|
|
|
queryDataResult = this.informationQueryService.queryProcessDataByParentIdAndContractIdTwo("", contractType, contractId, queryVO.getDateIsComplete());
|