From 7431fbd3084d3db5c517f7a41168fa48f60a3f28 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 2 Jun 2022 18:10:48 +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--=E9=A1=B9=E7=9B=AE=E7=8A=B6=E6=80=81=E8=BF=9B?= =?UTF-8?q?=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProjectStatusBoardServiceImpl.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) 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 4e192520f..ee0254983 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 @@ -187,7 +187,7 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService map.put("targetMarket",libraryBase.getTargetMarket());//目标市场 //1. 项目当前状态--projectState(蓝/红/黄/绿)-->studio视角下的数据 - int blue = 0; +// int blue = 0; int red = 0; int yellow = 0; int green = 0; @@ -240,7 +240,7 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService String conditionAssessment = conditionAssessmentEO.getConditionAssessment(); if(StringUtils.isNotBlank(conditionAssessment)){ if(CurrentProjectStatusEnum.BLUE.getValue().equals(conditionAssessment)){ - blue++; +// blue++; }else if(CurrentProjectStatusEnum.RED.getValue().equals(conditionAssessment)){ red++; }else if(CurrentProjectStatusEnum.YELLOW.getValue().equals(conditionAssessment)){ @@ -252,7 +252,8 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService } } } - String projectState = blue+"/"+red+"/"+yellow+"/"+green; + String projectState = red+"/"+yellow+"/"+green; +// String projectState = blue+"/"+red+"/"+yellow+"/"+green; map.put("projectStatus",projectState);//项目当前状态 String inventory = ""; @@ -284,8 +285,8 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService } } } - inventory = inventoryNotStarted+"/"+inventoryListToConfirm+"/"+inventoryAccepted+"/"+inventoryRejected+"/"; - task = taskNotStarted+"/"+taskListToConfirm+"/"+taskAccepted+"/"+taskRejected+"/"; + inventory = inventoryNotStarted+"/"+inventoryListToConfirm+"/"+inventoryAccepted+"/"+inventoryRejected; + task = taskNotStarted+"/"+taskListToConfirm+"/"+taskAccepted+"/"+taskRejected; } map.put("inventory",inventory);//清单确认状态 map.put("task",task);//任务确认状态