项目状态看板时间轴--项目名称

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java

@@ -111,8 +111,9 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
                     }
                 }
             }
-
+            List<SysDictItem> dictItemList = sysDictItemServiceImpl.selectItemsByDictCode("region");
             for (ProjectLibraryBase libraryBase : projectLibraryBaseList) {
+                targetMarket(projectLibraryBase, dictItemList, libraryBase);
                 Map<String,Object> mapList = new HashMap<>();
                 List<List<TimeNodeVO>> collect = new ArrayList<>();
                 if(ObjectUtils.isNotEmpty(startTime) && ObjectUtils.isNotEmpty(endTime)){
@@ -124,7 +125,7 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService
                 if(collect.size() != 0){
                     index ++;
                     mapList.put("index",index);
-                    mapList.put("projectName",libraryBase.getProjectName());
+                    mapList.put("projectName",libraryBase.getProjectName()+" "+libraryBase.getYearName()+"-"+libraryBase.getTargetMarket());
                     mapList.put("data",collect);
                     result.add(mapList);
                 }