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());