巡检-日常-检修-消缺统计代码上传

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<Long> phenomenonIds;
+	private List<String> phenomenonIds;
 	@ApiModelProperty(value = "缺陷数量")
 	@ExcelProperty(value = "缺陷数量", index = 2)
 	private int defectNum;

hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/impl/OperPhenomenonServiceImpl.java

@@ -634,7 +634,7 @@ public class OperPhenomenonServiceImpl extends BaseServiceImpl<OperPhenomenonMap
 		List<String> 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<String> 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());