From cb5a60a8737c9cb2566a97746d52839eaa323741 Mon Sep 17 00:00:00 2001
From: gaosong <gaosong@syxysoft.com>
Date: Thu, 1 Dec 2022 18:52:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E7=9C=8B=E6=9D=BF=E9=A1=B9=E7=9B=AE=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/project/entity/ProjectLibraryBase.java    |  5 +++++
 .../service/impl/ProjectStatusBoardServiceImpl.java   | 11 +++--------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java
index d831a5896..4ae6bda7f 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java
@@ -141,4 +141,9 @@ public class ProjectLibraryBase implements Comparable<ProjectLibraryBase> {
 //        return o.id-this.id;//降序
     }
 
+    public String getShowName(){
+        return projectName+yearName+targetMarket+projectVersion;
+    }
+
+
 }
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 a3e86ad4c..77c0e4c95 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
@@ -27,14 +27,7 @@ import org.springframework.stereotype.Service;
 
 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.*;
 import java.util.stream.Collectors;
 
 /**
@@ -128,6 +121,7 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
                     projectLibraryBaseLinkedList.addAll(projectLibraryBaseListTemp);
                 }
             }
+            projectLibraryBaseList.sort(Comparator.comparing(ProjectLibraryBase::getShowName));
 
             List<SysDictItem> dictItemList = sysDictItemServiceImpl.selectItemsByDictCode("region");
             for (ProjectLibraryBase libraryBase : projectLibraryBaseList) {
@@ -190,6 +184,7 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
             }
 
 
+            projectLibraryBaseList.sort(Comparator.comparing(ProjectLibraryBase::getShowName));
             for (ProjectLibraryBase libraryBase : projectLibraryBaseList) {
                 //处理目标市场
                 targetMarket(projectLibraryBase, dictItemList, libraryBase);