From cd373a1f9b2de04804b7869eb33abedcf3566363 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期三, 23 九月 2026 10:18:07 +0800
Subject: [PATCH] 【丽水】随访任务页查询，待发送/已发送数量改为异步查询
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java | 64 +++++++++++++++++++++++++++++++-
1 files changed, 62 insertions(+), 2 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
index f17faa3..814a4c5 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
@@ -474,6 +474,67 @@
}
/**
+ * 鍥捐〃Sheet鏋勫缓鍥炶皟锛氱敱璋冪敤鏂瑰湪缁欏畾宸ヤ綔绨夸笂杩藉姞涓�涓紙鎴栧涓級甯﹀浘琛ㄧ殑Sheet
+ */
+ public interface ChartSheetBuilder {
+ void build(XSSFWorkbook workbook);
+ }
+
+ /**
+ * 鍙栧簳灞� XSSFWorkbook锛圫XSSF 娴佸紡宸ヤ綔绨夸篃鏀寔鎸傚師鐢熷浘琛級锛屼笉鏀寔鏃惰繑鍥� null
+ */
+ public XSSFWorkbook getXssfWorkbook() {
+ if (wb instanceof SXSSFWorkbook) {
+ return ((SXSSFWorkbook) wb).getXSSFWorkbook();
+ }
+ if (wb instanceof XSSFWorkbook) {
+ return (XSSFWorkbook) wb;
+ }
+ return null;
+ }
+
+ /**
+ * 瀵煎嚭涓や釜鏁版嵁Sheet + 涓�涓浘琛⊿heet锛堝浘琛ㄥ唴瀹圭敱璋冪敤鏂归�氳繃 builder 杩藉姞锛�
+ *
+ * @param response 杩斿洖鏁版嵁
+ * @param list1 绗竴涓猄heet鐨勬暟鎹泦鍚�
+ * @param sheetName1 绗竴涓猄heet鐨勫悕绉�
+ * @param list2 绗簩涓猄heet鐨勬暟鎹泦鍚�
+ * @param sheetName2 绗簩涓猄heet鐨勫悕绉�
+ * @param clazz2 绗簩涓猄heet鏁版嵁瀵硅薄鐨凜lass
+ * @param chartBuilder 鍥捐〃Sheet鏋勫缓鍥炶皟锛屽彲涓虹┖锛堜负绌烘椂涓庝袱Sheet瀵煎嚭瀹屽叏涓�鏍凤級
+ */
+ public void exportExcelTwoSheetWithChart(HttpServletResponse response,
+ List<T> list1, String sheetName1,
+ List<?> list2, String sheetName2, Class<?> clazz2,
+ ChartSheetBuilder chartBuilder) {
+ response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+ response.setCharacterEncoding("utf-8");
+ // 鍒濆鍖栧苟鍐欏叆Sheet1
+ this.init(list1, sheetName1, StringUtils.EMPTY, Type.EXPORT);
+ writeSheet();
+ // 杩藉姞鍐欏叆Sheet2
+ writeAdditionalSheet(list2, sheetName2, clazz2);
+ // 杩藉姞鍥捐〃Sheet
+ if (chartBuilder != null) {
+ XSSFWorkbook xssfWorkbook = getXssfWorkbook();
+ if (xssfWorkbook != null) {
+ chartBuilder.build(xssfWorkbook);
+ } else {
+ log.warn("褰撳墠宸ヤ綔绨夸笉鏀寔鍘熺敓鍥捐〃锛岃烦杩囧浘琛⊿heet");
+ }
+ }
+ // 杈撳嚭鍒板搷搴旀祦
+ try {
+ wb.write(response.getOutputStream());
+ } catch (Exception e) {
+ log.error("瀵煎嚭Excel寮傚父{}", e.getMessage());
+ } finally {
+ IOUtils.closeQuietly(wb);
+ }
+ }
+
+ /**
* 鍚戝綋鍓嶅伐浣滅翱杩藉姞鍐欏叆涓�涓猄heet
*
* @param dataList 鏁版嵁闆嗗悎
@@ -481,8 +542,7 @@
* @param dataClazz 鏁版嵁瀵硅薄鐨凜lass
*/
@SuppressWarnings("unchecked")
- public void writeAdditionalSheet(List<?> dataList, String sheetName, Class<?> dataClazz) {
- if (dataList == null) {
+ public void writeAdditionalSheet(List<?> dataList, String sheetName, Class<?> dataClazz) { if (dataList == null) {
dataList = new ArrayList<>();
}
// 淇濆瓨鍘熷鐘舵��
--
Gitblit v1.9.3