From 5b5b11ce6eed28b9f9ccf4a7969600e02fde6a74 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 29 Nov 2022 10:14:25 +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 --- .../project/service/impl/ProjectStatusBoardServiceImpl.java | 6 +++++- 1 file changed, 5 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 f1c2495ad..a3e86ad4c 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 @@ -201,8 +201,12 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService if(projectTaskInventoryEOList.size() != 0){ projectTaskInventoryEOS = projectTaskInventoryEOList.stream().filter(e -> ProjectLawsInventoryIdList.contains(e.getProjectLawsInventoryId())).collect(Collectors.toList()); } + String projectVersion = libraryBase.getProjectVersion(); + if(StringUtils.isBlank(projectVersion)){ + projectVersion = "00"; + } Map map = new HashMap<>(); - map.put("projectName",libraryBase.getProjectName());//项目名称 + map.put("projectName",libraryBase.getProjectName()+" "+libraryBase.getYearName()+"-"+libraryBase.getTargetMarket()+"-"+projectVersion);//项目名称 map.put("targetMarket",libraryBase.getTargetMarket());//目标市场 //1. 项目当前状态--projectState(蓝/红/黄/绿)-->studio视角下的数据