From b4061eccc46e4e486b736c23692b2d5b5c43d07d Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 25 Sep 2023 16:28:57 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95-=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E7=8A=B6=E6=80=81=E4=B8=8B=E6=8B=89=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...rojectCertificationInventoryEOServiceImpl.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java index 4592a6b41..ea4305ab3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/platform/service/impl/PlatformProjectCertificationInventoryEOServiceImpl.java @@ -1805,12 +1805,17 @@ public class PlatformProjectCertificationInventoryEOServiceImpl extends ServiceI for (CertificationInventoryFlowStatusEnum value : values) { Map flowStatusMap = new HashMap<>(); String name = value.getCnName(); - if(StringUtils.equals(cut,CutEnum.EN.getValue())){ - name = value.getEnName(); + if(!CertificationInventoryFlowStatusEnum.LIST_TO_BE_RELEASED.getCnName().equals(name) + && !CertificationInventoryFlowStatusEnum.LIST_TO_BE_RELEASED.getEnName().equals(name) + && !CertificationInventoryFlowStatusEnum.CERTIFICATION_RETURNED.getCnName().equals(name) + && !CertificationInventoryFlowStatusEnum.CERTIFICATION_RETURNED.getEnName().equals(name)){ + if(StringUtils.equals(cut,CutEnum.EN.getValue())){ + name = value.getEnName(); + } + flowStatusMap.put("name",name); + flowStatusMap.put("value",value.getValue()); + result.add(flowStatusMap); } - flowStatusMap.put("name",name); - flowStatusMap.put("value",value.getValue()); - result.add(flowStatusMap); } return Result.OK(result); }