|
@@ -4355,6 +4355,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
|
|
|
|
|
|
}
|
|
|
}
|
|
|
+ List<User> userList = userMapper.selectList(new QueryWrapper<User>().eq("company_id", companyId));
|
|
|
for (Map<String, Object> map : allReportByDate) {
|
|
|
HSSFRow row = sheet.createRow(rowNum);
|
|
|
row.createCell(0).setCellValue(rowNum);
|
|
@@ -4466,7 +4467,6 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
|
|
|
index++;
|
|
|
//审核流程显示
|
|
|
List<ReportLogDetail> detailList = logDetails.stream().filter(log -> log.getReportId().equals((Integer) map.get("id"))).collect(Collectors.toList());
|
|
|
- List<User> userList = userMapper.selectList(new QueryWrapper<User>().eq("company_id", companyId));
|
|
|
if (detailList.size() > 0) {
|
|
|
StringBuilder sb = new StringBuilder();
|
|
|
boolean isFirst = true;
|