Browse Source

fix--综合查询导出区分涉及单位

master
buaixuexideshitongxue 2 weeks ago
parent
commit
8e78b54823
  1. 15
      src/main/java/com/biutag/supervision/service/NegativeTaskService.java

15
src/main/java/com/biutag/supervision/service/NegativeTaskService.java

@ -194,16 +194,11 @@ public class NegativeTaskService extends ServiceImpl<NegativeTaskMapper, Negativ
Set<String> seenLead = new HashSet<>();
List<ExportNegativeBlameLeaderVo> departBlameLeaderVoList = blameVoList.stream()
.filter(one -> StrUtil.isNotBlank(one.getLeadName()))
List<ExportNegativeBlameVo> departBlameLeaderVoList = blameVoList.stream()
// .filter(one -> StrUtil.isNotBlank(one.getLeadName()))
.filter(one -> "涉及单位".equals(one.getAccountabilityTarget()))
// .filter(one -> seenLead.add(one.getId() + "_" + one.getLeadHandleResultName()))
.map(one -> {
ExportNegativeBlameLeaderVo exportNegativeBlameLeaderVo = new ExportNegativeBlameLeaderVo();
BeanUtils.copyProperties(one, exportNegativeBlameLeaderVo);
return exportNegativeBlameLeaderVo;
}
).toList();
.toList();
ByteArrayOutputStream os = new ByteArrayOutputStream();
@ -216,7 +211,7 @@ public class NegativeTaskService extends ServiceImpl<NegativeTaskMapper, Negativ
WriteSheet sheet3 = EasyExcel.writerSheet(2, "个人问题涉及领导台账")
.head(ExportNegativeBlameLeaderVo.class).build();
WriteSheet sheet4 = EasyExcel.writerSheet(3, "单位问题涉及台账")
.head(ExportNegativeBlameLeaderVo.class).build();
.head(ExportNegativeBlameVo.class).build();
excelWriter.write(list, sheet1);
excelWriter.write(blameVoList, sheet2);
excelWriter.write(blameLeaderVoList, sheet3);
@ -232,7 +227,7 @@ public class NegativeTaskService extends ServiceImpl<NegativeTaskMapper, Negativ
WriteSheet sheet3 = EasyExcel.writerSheet(2, "个人问题涉及领导台账")
.head(ExportNegativeBlameLeaderVo.class).build();
WriteSheet sheet4 = EasyExcel.writerSheet(3, "单位问题涉及台账")
.head(ExportNegativeBlameLeaderVo.class).build();
.head(ExportNegativeBlameVo.class).build();
excelWriter.write(list, sheet1);
excelWriter.write(blameVoList, sheet2);
excelWriter.write(blameLeaderVoList, sheet3);

Loading…
Cancel
Save