修复项目进度

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/common/Constant.java

@@ -70,5 +70,19 @@ public class Constant {
     public static final String ZD_DICT_A6_VALUE_SHIYONGQUAN ="3,4,5,7,11,12,15,16,17,23,24,25,26,29,30,31,34";
 
 
+    //汇交矢量表
+    public static final List<String> PROJECT_NODE_NAME_LIST = List.of(
+            "规划条件与用地红线出具",
+            "用地预审与选址",
+            "用地报批",
+            "土地供应",
+            "国有建设用地使用权首次登记",
+            "建设用地规划许可",
+            "建设工程规划许可",
+            "土地核验与规划核实",
+            "国有建设用地使用权及房屋所有权首次登记"
+    );
+
+
 
 }

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/impl/ProjectImpl.java

@@ -2,6 +2,7 @@ package com.siwei.apply.service.impl;
 
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
+import com.siwei.apply.common.Constant;
 import com.siwei.apply.domain.*;
 import com.siwei.apply.domain.res.*;
 import com.siwei.apply.domain.vo.NodeVo;
@@ -176,6 +177,9 @@ public class ProjectImpl implements ProjectService {
             for (Project project : projectList) {
                 String projectId = project.getId();
                 List<ProjectWorkflow> projectWorkflowList = projectWorkflowMapper.selectByProjectId(projectId);
+                if(project.getProjectType()==2){
+                    projectWorkflowList.stream().filter(s->!s.getWorkflowId().equals("17")).collect(Collectors.toList());
+                }
                 // 倒叙排序
                 projectWorkflowList = projectWorkflowList.stream()
                         .sorted(Comparator.comparing(ProjectWorkflow::getWorkflowId).reversed())
@@ -195,14 +199,24 @@ public class ProjectImpl implements ProjectService {
                     }
                 }
             }
+
             // 获取项目进度
             List<ProjectProcessRes> projectProcessList = new ArrayList<>();
-            for (Map.Entry<String, Integer> entry : progressMap.entrySet()) {
-                ProjectProcessRes projectProcessRes = new ProjectProcessRes();
-                projectProcessRes.setName(entry.getKey());
-                projectProcessRes.setCount(entry.getValue());
-                projectProcessList.add(projectProcessRes);
+            for(String nodeName : Constant.PROJECT_NODE_NAME_LIST){
+                if(progressMap.containsKey(nodeName)){
+                    ProjectProcessRes projectProcessRes = new ProjectProcessRes();
+                    projectProcessRes.setName(nodeName);
+                    projectProcessRes.setCount(progressMap.get(nodeName));
+                    projectProcessList.add(projectProcessRes);
+                }
             }
+//            for (Map.Entry<String, Integer> entry : progressMap.entrySet()) {
+//                ProjectProcessRes projectProcessRes = new ProjectProcessRes();
+//                projectProcessRes.setName(entry.getKey());
+//                projectProcessRes.setCount(entry.getValue());
+//                projectProcessList.add(projectProcessRes);
+//            }
+//            Collections.reverse(projectProcessList);  //倒叙
             projectOverviewRes.setProjectProcessList(projectProcessList);
         }
         return projectOverviewRes;