优化内页查询，添加评定

blade-service/blade-business/src/main/java/org/springblade/business/controller/NeiYeController.java

@@ -78,7 +78,9 @@ public class NeiYeController {
             }
             //不是工序，则查询当前节点下的所有填报节点
             List<QueryProcessDataVO> queryDataResult = new ArrayList<>();
-            if(!new Integer("6").equals(node.getNodeType()) && !Arrays.asList("1,2,3,4".split(",")).contains(node.getMajorDataType().toString())){
+            //有些填报节点的MajorDataType为0
+            if(!new Integer("6").equals(node.getNodeType()) && !Arrays.asList("1,2,3,4".split(",")).contains(node.getMajorDataType().toString())
+                    && !node.getNodeName().contains("开工报告")&& !node.getNodeName().contains("质量检验评定表")){
                 //非填报节点
                 if (node.getParentId() == 0){
                     String contractI = node.getContractId();
@@ -101,32 +103,35 @@ public class NeiYeController {
             if (queryDataResult != null && queryDataResult.size() > 0) {
                 //删除掉首件
                 queryDataResult.removeIf(query -> StringUtils.isNotEmpty(query.getQueryType()) && "3".equals(query.getQueryType()));
-                //过滤Evaluate
-                queryDataResult.stream().forEach(qdr->{
-                    Integer status = qdr.getStatus();
-                    if (status == null){
-                        qdr.setStatus(0);
-                        qdr.setEvaluate("false");
-                    }else if (status.equals(2)){
-                        qdr.setEvaluate("true");
-                    }else {
-                        qdr.setEvaluate("false");
+                //设置评定值
+                queryDataResult.stream().forEach(qdr->qdr.setEvaluate("false"));
+                List<QueryProcessDataVO> vos = queryDataResult.stream().filter(qdr -> qdr.getTitle().contains("质量检验评定表"))
+                        .filter(qdr -> "2".equals(qdr.getStatus() + "")).collect(Collectors.toList());
+                if (vos != null && vos.size() > 0){
+                    //获取父节点，为所有子节点设置已评定
+                    for (QueryProcessDataVO vo : vos) {
+                        String parentId = vo.getParentId();
+                        queryDataResult.stream().forEach(qdr->{
+                            if (qdr.getAncestors().contains(parentId)){
+                                qdr.setEvaluate("true");
+                            }
+                        });
                     }
-                });
-                String isEvaluate = String.valueOf(queryVO.getIsEvaluate());
-                if (!"".equals(isEvaluate) && !"null".equals(isEvaluate) && isEvaluate != null) {
-                        queryDataResult = queryDataResult.stream()
-                                .filter(qdr->isEvaluate.equals(qdr.getEvaluate())).collect(Collectors.toList());
-                }
-                if (queryDataResult.size() <= 0){
-                    return R.data(300, null, "未查询到数据");
                 }
                 //审批状态
                 String taskStatus = queryVO.getTaskStatus();
                 if (!"".equals(taskStatus) && !"null".equals(taskStatus) && taskStatus != null) {
-                    Integer sta = Integer.valueOf(taskStatus) -1;
                     queryDataResult = queryDataResult.stream()
-                            .filter(qdr->sta.equals(qdr.getStatus())).collect(Collectors.toList());
+                            .filter(qdr->taskStatus.equals(qdr.getStatus()+"")).collect(Collectors.toList());
+                }
+                if (queryDataResult.size() <= 0){
+                    return R.data(300, null, "未查询到数据");
+                }
+                //过滤Evaluate是否评定
+                String isEvaluate = String.valueOf(queryVO.getIsEvaluate());
+                if (!"".equals(isEvaluate) && !"null".equals(isEvaluate) && isEvaluate != null) {
+                        queryDataResult = queryDataResult.stream()
+                                .filter(qdr->isEvaluate.equals(qdr.getEvaluate())).collect(Collectors.toList());
                 }
                 if (queryDataResult.size() <= 0){
                     return R.data(300, null, "未查询到数据");
@@ -157,7 +162,7 @@ public class NeiYeController {
                 if (queryDataResult.size() <= 0){
                     return R.data(300, null, "未查询到数据");
                 }
-                //上报批次
+                //上报批次  ,保存节点的时候没有上传批次，只能去流程查
                 for (QueryProcessDataVO vo : queryDataResult) {
                     if (vo.getInformationQueryId() != null && vo.getStatus() != 0){
                         List<Task> tasks = taskClient.queryTaskListByFormDataId(vo.getInformationQueryId());

blade-service/blade-business/src/main/java/org/springblade/business/mapper/InformationQueryMapper.xml

@@ -458,7 +458,7 @@
             IFNULL(if(length(trim(wtc.full_name)) > 0, wtc.full_name, wtc.node_name),wtc.node_name) AS title,
             wtc.parent_id AS parentId,
             uiq.id AS informationQueryId,
-            uiq.status,
+            IFNULL(uiq.status,0) AS status,
             uiq.type AS queryType
         FROM
             m_wbs_tree_contract AS wtc

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/InformationQueryServiceImpl.java

@@ -123,9 +123,6 @@ public class InformationQueryServiceImpl extends BaseServiceImpl<InformationQuer
     @Override
     public List<QueryProcessDataVO> queryProcessDataByParentIdAndContractIdTwo(String parentId, Integer classify, String contractId) {
         List<QueryProcessDataVO> result = this.baseMapper.queryProcessDataByParentIdAndContractIdTwo(parentId, classify, contractId);
-        if (result == null || result.size() <= 0) {
-            result = this.baseMapper.queryProcessDataByParentIdAndContractIdTwo("", classify, contractId);
-        }
         return result;
     }