From a9a75dc100bf0da6a36748cb71d0d021ad6fd168 Mon Sep 17 00:00:00 2001 From: wanjia <553039491@qq.com> Date: Thu, 26 Dec 2024 11:40:03 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E7=BB=84=E7=BB=87=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E5=8F=B0):=E4=BA=A7=E5=93=81=E7=BB=9F=E8=AE=A1=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dashboard/controller/PmsDashboardController.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/dashboard/controller/PmsDashboardController.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/dashboard/controller/PmsDashboardController.java index 9645e37b5..a331f1e42 100644 --- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/dashboard/controller/PmsDashboardController.java +++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/dashboard/controller/PmsDashboardController.java @@ -39,6 +39,8 @@ import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; +import static com.microservices.pms.utils.PmsConstants.PRODUCT_PLAN_CLOSED_STATUS_NAME; + @RestController @RequestMapping("/{enterpriseIdentifier}/dashboard") @Api(tags = "项目管理-工作台") @@ -223,8 +225,7 @@ public class PmsDashboardController extends BaseController { PmsRequirementStatResVo pmsRequirementStatResVo = buildPmsRequirementStatResVo( productIdentifier, getReqSpecsList(), - ProductReqStatus.REVIEWED_REQ_SPECS); - + ProductReqStatus.COMPLETED_REQ_SPECS); return R.ok(pmsRequirementStatResVo); } @@ -237,7 +238,7 @@ public class PmsDashboardController extends BaseController { PmsProductStatus pmsProductStatus = new PmsProductStatus(); pmsProductStatus.setType(1); List pmsTypeDataVos = pmsProductStatusService.selectPmsProductStatusList(pmsProductStatus); - List statusStatVos = pmsTypeDataVos.stream().map(e -> { + List statusStatVos = pmsTypeDataVos.stream().filter(e -> !PRODUCT_PLAN_CLOSED_STATUS_NAME.equals(e.getName())).map(e -> { ReqStatusStatVo vo = new ReqStatusStatVo(); vo.setKey(String.valueOf(e.getId())); vo.setNum(status2NumMap.getOrDefault(String.valueOf(e.getId()), 0)); @@ -258,10 +259,9 @@ public class PmsDashboardController extends BaseController { private List getReqSpecsList() { return Stream.of(ProductReqStatus.PENDING_REVIEW_REQ_SPECS.getKey(), ProductReqStatus.PLANNED_REQ_SPECS.getKey(), - ProductReqStatus.REJECTED_CHANGE_REQ_SPECS.getKey(), + ProductReqStatus.REJECTED_REQ_SPECS.getKey(), ProductReqStatus.REVIEWED_REQ_SPECS.getKey(), - ProductReqStatus.COMPLETED_REQ_SPECS.getKey(), - ProductReqStatus.CHANGED_REQ_SPECS.getKey()) + ProductReqStatus.COMPLETED_REQ_SPECS.getKey()) .collect(Collectors.toList()); }