diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PcWorkListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PcWorkListResultDTO.java index 13e8562e2e..0225f9ff7b 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PcWorkListResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PcWorkListResultDTO.java @@ -42,7 +42,7 @@ public class PcWorkListResultDTO implements Serializable { /** * 事项类型名称 */ - private List workTypeName; + private String workTypeName; /** * 有无异常 @@ -94,7 +94,7 @@ public class PcWorkListResultDTO implements Serializable { public PcWorkListResult() { this.title = ""; this.workTypeCode = new ArrayList<>(); - this.workTypeName = new ArrayList<>(); + this.workTypeName = ""; this.isNormal = ""; this.happenAddress = ""; this.happenTime = ""; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/PcWorkListExport.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/PcWorkListExport.java index 12199212a6..e553e205e5 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/PcWorkListExport.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/PcWorkListExport.java @@ -32,7 +32,7 @@ public class PcWorkListExport { @ExcelProperty("事项类型名称") @ColumnWidth(40) - private String workTypeNames; + private String workTypeName; @ExcelProperty("有无异常") private String isNormal; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java index 5e388fc12b..feef559058 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java @@ -195,7 +195,7 @@ public class PatrolRoutineWorkServiceImpl extends BaseServiceImpl { - l.setWorkTypeName(disposeWorkTypeCode(workTypeResult.getData(),l.getWorkTypeCode())); + l.setWorkTypeName(disposeWorkTypeCode(workTypeResult.getData(),l.getWorkTypeCode()).stream().collect(Collectors.joining(","))); gridNamesResult.getData().stream().filter(g -> l.getGridId().equals(g.getGridId())).forEach(g -> l.setGridName(g.getGridName())); }); result.setList(list); @@ -220,9 +220,6 @@ public class PatrolRoutineWorkServiceImpl extends BaseServiceImpl dtos = pcWorkList(formDTO).getList(); - dtos.forEach(d -> { - d.setWorkTypeNames(d.getWorkTypeName().toString()); - }); List data = ConvertUtils.sourceToTarget(dtos, PcWorkListExport.class); num = data.size(); excelWriter.write(data, writeSheet);