From 946dc71d5679974538986e38f19c48bb2d1bdcae Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 12 七月 2025 18:23:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ReportController.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ReportController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ReportController.java
index e3b98cb..3c70789 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ReportController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ReportController.java
@@ -661,25 +661,25 @@
entityList.add(excelExportEntity1);
}
- ExcelExportEntity excelExportEntity8 = new ExcelExportEntity("整改完成任务", "total", 15);
+ ExcelExportEntity excelExportEntity8 = new ExcelExportEntity("整改完成任务", "num7", 15);
excelExportEntity8.setGroupName("任务情况汇总");
entityList.add(excelExportEntity8);
- ExcelExportEntity excelExportEntity7 = new ExcelExportEntity("超时未执行任务", "total", 15);
+ ExcelExportEntity excelExportEntity7 = new ExcelExportEntity("超时未执行任务", "num6", 15);
excelExportEntity7.setGroupName("任务情况汇总");
entityList.add(excelExportEntity7);
- ExcelExportEntity excelExportEntity6 = new ExcelExportEntity("审核通过任务", "total", 15);
+ ExcelExportEntity excelExportEntity6 = new ExcelExportEntity("审核通过任务", "num5", 15);
excelExportEntity6.setGroupName("任务情况汇总");
entityList.add(excelExportEntity6);
- ExcelExportEntity excelExportEntity5 = new ExcelExportEntity("待整改任务", "total", 15);
+ ExcelExportEntity excelExportEntity5 = new ExcelExportEntity("待整改任务", "num4", 15);
excelExportEntity5.setGroupName("任务情况汇总");
entityList.add(excelExportEntity5);
- ExcelExportEntity excelExportEntity4 = new ExcelExportEntity("未执行任务", "total", 15);
+ ExcelExportEntity excelExportEntity4 = new ExcelExportEntity("未执行任务", "num3", 15);
excelExportEntity4.setGroupName("任务情况汇总");
entityList.add(excelExportEntity4);
- ExcelExportEntity excelExportEntity3 = new ExcelExportEntity("清洁不合格", "total", 15);
+ ExcelExportEntity excelExportEntity3 = new ExcelExportEntity("清洁不合格", "num2", 15);
excelExportEntity3.setGroupName("任务情况汇总");
entityList.add(excelExportEntity3);
- ExcelExportEntity excelExportEntity2 = new ExcelExportEntity("清洁合格", "total", 15);
+ ExcelExportEntity excelExportEntity2 = new ExcelExportEntity("清洁合格", "num1", 15);
excelExportEntity2.setGroupName("任务情况汇总");
entityList.add(excelExportEntity2);
ExcelExportEntity excelExportEntity1 = new ExcelExportEntity("总数", "total", 15);
@@ -711,6 +711,7 @@
map.put("num6", row.getNum6());
map.put("num7", row.getNum7());
mapList.add(map);
+ break;
}
}
--
Gitblit v1.7.1