From f341ca0e5ba853ab83f533445e8228d0f1fc0c7d Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Mon, 28 Nov 2022 16:12:17 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=8A=B6=E6=80=81=E7=9C=8B?=
 =?UTF-8?q?=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProjectStatusBoardServiceImpl.java   | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java
index e0f426b3f..f1c2495ad 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java
@@ -29,8 +29,10 @@ import javax.servlet.http.HttpServletRequest;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -111,6 +113,22 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
                     }
                 }
             }
+
+
+            List<ProjectLibraryBase> projectLibraryBaseLinkedList = new LinkedList<>();
+            for (ProjectLibraryBase libraryBase : projectLibraryBaseList) {
+                if(StringUtils.isBlank(libraryBase.getParentId())){
+                    List<ProjectLibraryBase> projectLibraryBaseListTemp = new LinkedList<>();
+                    projectLibraryBaseListTemp.add(libraryBase);
+                    List<ProjectLibraryBase> collect = projectLibraryBaseList.stream().filter(e -> libraryBase.getId().equals(e.getParentId())).collect(Collectors.toList());
+                    if(ObjectUtils.isNotEmpty(collect)){
+                        projectLibraryBaseListTemp.addAll(collect);
+                        Collections.sort(projectLibraryBaseListTemp);
+                    }
+                    projectLibraryBaseLinkedList.addAll(projectLibraryBaseListTemp);
+                }
+            }
+
             List<SysDictItem> dictItemList = sysDictItemServiceImpl.selectItemsByDictCode("region");
             for (ProjectLibraryBase libraryBase : projectLibraryBaseList) {
                 targetMarket(projectLibraryBase, dictItemList, libraryBase);
@@ -125,7 +143,7 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
                 if(collect.size() != 0){
                     index ++;
                     mapList.put("index",index);
-                    mapList.put("projectName",libraryBase.getProjectName()+" "+libraryBase.getYearName()+"-"+libraryBase.getTargetMarket());
+                    mapList.put("projectName",libraryBase.getProjectName()+" "+libraryBase.getYearName()+"-"+libraryBase.getTargetMarket()+"-"+libraryBase.getProjectVersion());
                     mapList.put("data",collect);
                     result.add(mapList);
                 }