From 28dc691f638ee49c93c61dc8b95f751255fc5c2f Mon Sep 17 00:00:00 2001 From: tyty Date: Fri, 18 Aug 2023 10:32:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A1=E6=A3=80-=E6=97=A5=E5=B8=B8-=E6=A3=80?= =?UTF-8?q?=E4=BF=AE-=E6=B6=88=E7=BC=BA=E7=BB=9F=E8=AE=A1=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/hnac/hzims/operational/report/vo/CheckVoteChartVo.java | 2 +- .../operational/defect/service/impl/OperPhenomenonServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/report/vo/CheckVoteChartVo.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/report/vo/CheckVoteChartVo.java index 0c4234b..9946e8f 100644 --- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/report/vo/CheckVoteChartVo.java +++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/report/vo/CheckVoteChartVo.java @@ -23,7 +23,7 @@ public class CheckVoteChartVo { private int phenomenonNum; @ApiModelProperty(value = "现象数量id") @ExcelIgnore - private List phenomenonIds; + private List phenomenonIds; @ApiModelProperty(value = "缺陷数量") @ExcelProperty(value = "缺陷数量", index = 2) private int defectNum; diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/impl/OperPhenomenonServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/impl/OperPhenomenonServiceImpl.java index f9f0ac1..2624f0a 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/impl/OperPhenomenonServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/impl/OperPhenomenonServiceImpl.java @@ -634,7 +634,7 @@ public class OperPhenomenonServiceImpl extends BaseServiceImpl handerIds = Optional.ofNullable(list).orElse(new ArrayList<>()).stream().filter(s -> s.getIsDefect() !=null).filter(s -> "1".equals(s.getHandleStatus())).map(s -> s.getDefectCode()).collect(Collectors.toList()); List conclusionIds = Optional.ofNullable(list).orElse(new ArrayList<>()).stream().filter(s -> s.getIsDefect() !=null).filter(s -> "1".equals(s.getConclusionStatus())).map(s -> s.getDefectCode()).collect(Collectors.toList()); voteChartVo.setPhenomenonNum(list.size()); - voteChartVo.setPhenomenonIds(list.stream().map(s -> s.getId()).collect(Collectors.toList())); + voteChartVo.setPhenomenonIds(list.stream().map(s -> s.getDefectCode()).collect(Collectors.toList())); voteChartVo.setDefectNum(checkIds.size()); voteChartVo.setDefectIds(checkIds); voteChartVo.setHandleNum(handerIds.size());