|
|
@@ -3246,9 +3246,9 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
|
|
|
titles.add("投入阶段");
|
|
|
}
|
|
|
if (timeType.getShowFillauditTime() == 1) {
|
|
|
- titles.add("填写时间");
|
|
|
- titles.add("审核人");
|
|
|
- titles.add("审核时间");
|
|
|
+// titles.add("填写时间");
|
|
|
+// titles.add("项目审核人");
|
|
|
+// titles.add("审核时间");
|
|
|
titles.add("审核流程");
|
|
|
}
|
|
|
titles.add("工作事项");
|
|
|
@@ -3391,6 +3391,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
|
|
|
msg.setError("数据量过大，请分时间段导出");
|
|
|
return msg;
|
|
|
}
|
|
|
+ DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
|
|
|
DecimalFormat df = new DecimalFormat("#0.0");
|
|
|
for (Map<String, Object> map : allReportByDate) {
|
|
|
HSSFRow row = sheet.createRow(rowNum);
|
|
|
@@ -3457,24 +3458,39 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
|
|
|
index++;
|
|
|
}
|
|
|
if (timeType.getShowFillauditTime() == 1) {
|
|
|
- row.createCell(index).setCellValue(sdf.format((Date)map.get("time")));
|
|
|
- index++;
|
|
|
- row.createCell(index).setCellValue((String)map.get("projectAuditorName"));
|
|
|
- index++;
|
|
|
- if (map.get("projectAuditTime") == null) {
|
|
|
- row.createCell(index).setCellValue("");
|
|
|
- } else {
|
|
|
- row.createCell(index).setCellValue(sdf.format((Date)map.get("projectAuditTime")));
|
|
|
- }
|
|
|
- index++;
|
|
|
+// row.createCell(index).setCellValue(sdf.format((Date)map.get("time")));
|
|
|
+// index++;
|
|
|
+// row.createCell(index).setCellValue((String)map.get("projectAuditorName"));
|
|
|
+// index++;
|
|
|
+// if (map.get("projectAuditTime") == null) {
|
|
|
+// row.createCell(index).setCellValue("");
|
|
|
+// } 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")));
|
|
|
+ QueryWrapper<ReportLog> logQueryWrapper = new QueryWrapper<ReportLog>().eq("report_ids", (int)map.get("id"))
|
|
|
+ .or().likeLeft("report_ids", ","+map.get("id"))
|
|
|
+ .or().like("report_ids", ","+map.get("id")+",")
|
|
|
+ .or().likeRight("report_ids", map.get("id")+",");
|
|
|
+ List<ReportLog> auditLogs = reportLogMapper.selectList(logQueryWrapper);
|
|
|
|
|
|
if (auditLogs.size() == 0) {
|
|
|
row.createCell(index).setCellValue("");
|
|
|
} else {
|
|
|
- String auditFlow = auditLogs.stream().map(ReportLog::getMsg).collect(Collectors.joining("->"));
|
|
|
- row.createCell(index).setCellValue(auditFlow);
|
|
|
+ StringBuilder sb = new StringBuilder();
|
|
|
+ boolean isFirst = true;
|
|
|
+ for (ReportLog audit:auditLogs) {
|
|
|
+ String time = dtf.format(audit.getOperateDate());
|
|
|
+ String msg = time+" " + audit.getMsg();
|
|
|
+ if (!isFirst) {
|
|
|
+ sb.append("->");
|
|
|
+ } else {
|
|
|
+ isFirst = false;
|
|
|
+ }
|
|
|
+ sb.append(msg);
|
|
|
+ }
|
|
|
+ row.createCell(index).setCellValue(sb.toString());
|
|
|
}
|
|
|
|
|
|
index++;
|
Lijy