WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改项目状态看板项目排序

Browse Source
This commit is contained in:
gaosong
2022-12-01 18:52:14 +08:00
parent 90fec909c5
commit cb5a60a873
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java
+5
View File
@@ -141,4 +141,9 @@ public class ProjectLibraryBase implements Comparable<ProjectLibraryBase> {
// return o.id-this.id;//降序 // return o.id-this.id;//降序
} }
public String getShowName(){
return projectName+yearName+targetMarket+projectVersion;
}
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java
+3 -8
View File
@@ -27,14 +27,7 @@ import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.*;
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; import java.util.stream.Collectors;
/** /**
@@ -128,6 +121,7 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
projectLibraryBaseLinkedList.addAll(projectLibraryBaseListTemp); projectLibraryBaseLinkedList.addAll(projectLibraryBaseListTemp);
} }
} }
projectLibraryBaseList.sort(Comparator.comparing(ProjectLibraryBase::getShowName));
List<SysDictItem> dictItemList = sysDictItemServiceImpl.selectItemsByDictCode("region"); List<SysDictItem> dictItemList = sysDictItemServiceImpl.selectItemsByDictCode("region");
for (ProjectLibraryBase libraryBase : projectLibraryBaseList) { for (ProjectLibraryBase libraryBase : projectLibraryBaseList) {
@@ -190,6 +184,7 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
} }
projectLibraryBaseList.sort(Comparator.comparing(ProjectLibraryBase::getShowName));
for (ProjectLibraryBase libraryBase : projectLibraryBaseList) { for (ProjectLibraryBase libraryBase : projectLibraryBaseList) {
//处理目标市场 //处理目标市场
targetMarket(projectLibraryBase, dictItemList, libraryBase); targetMarket(projectLibraryBase, dictItemList, libraryBase);