日报导出增加审核流程一列

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java

@@ -3249,6 +3249,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                 titles.add("填写时间");
                 titles.add("审核人");
                 titles.add("审核时间");
+                titles.add("审核流程");
             }
             titles.add("工作事项");
             if(stateKey==1){
@@ -3465,6 +3466,16 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                     } else {
                         row.createCell(index).setCellValue(sdf.format((Date)map.get("projectAuditTime")));
                     }
+                    index++;
+                    //审核流程显示
+                    List<ReportLog> auditLogs = reportLogMapper.selectList(new QueryWrapper<ReportLog>().eq("report_ids", (int)map.get("id")));
+
+                    if (auditLogs.size() == 0) {
+                        row.createCell(index).setCellValue("");
+                    } else {
+                        String auditFlow = auditLogs.stream().map(ReportLog::getMsg).collect(Collectors.joining("->"));
+                        row.createCell(index).setCellValue(auditFlow);
+                    }
 
                     index++;
                 }