From 486301ef1bee7a85ac03d2654fd6db1bc9713f5c Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期二, 16 十二月 2025 14:56:38 +0800
Subject: [PATCH] 【丽水】随访统计导出 导出的文件名应为 X月出院随访统计
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java | 31 +++++++++++--------------------
1 files changed, 11 insertions(+), 20 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
index 4865213..0b390aa 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
@@ -243,20 +243,6 @@
/**
* 闅忚鍘嗗彶璁板綍瀵煎嚭
*/
- //@PreAuthorize("@ss.hasPermi('system:taskcall:export')")
-// @Log(title = "闅忚鍘嗗彶璁板綍瀵煎嚭", businessType = BusinessType.EXPORT)
-// @PostMapping("/getSubtaskByDiagnameExport")
-// public void getSubtaskByDiagnameExport(HttpServletResponse response, List<ServiceSubtaskDiagname> serviceSubtaskDiagnameList) {
-// ExcelUtil<ServiceSubtaskDiagname> util = new ExcelUtil<ServiceSubtaskDiagname>(ServiceSubtaskDiagname.class);
-//
-// if (active.equals("ls") || active.equals("druid")) {
-// util.exportExcel(response, serviceSubtaskDiagnameList, LocalDate.now().getMonthValue() + "闅忚缁熻瀵煎嚭");
-// } else {
-// util.exportExcel(response, serviceSubtaskDiagnameList, "闅忚缁熻瀵煎嚭");
-// }
-// }
-
- //@PreAuthorize("@ss.hasPermi('system:taskcall:export')")
@Log(title = "闅忚鍘嗗彶璁板綍瀵煎嚭", businessType = BusinessType.EXPORT)
@PostMapping("/getSubtaskByDiagnameExport")
public void getSubtaskByDiagnameExport(HttpServletResponse response, ServiceSubtask serviceSubtask) {
@@ -265,15 +251,16 @@
serviceSubtask.setOrgid(user.getOrgid());
serviceSubtask.setPageNum(PageUtils.getOffset(serviceSubtask.getPageNum(), serviceSubtask.getPageSize()));
List<ServiceSubtask> subtaskList = serviceSubtaskService.selectServiceSubtaskByDiagname(serviceSubtask);
- ExcelUtil<ServiceSubtask> util = new ExcelUtil<ServiceSubtask>(ServiceSubtask.class);
+ List<ServiceSubtaskDiagname> serviceSubtaskDiagnameList = new ArrayList<>();
+ if (CollectionUtils.isNotEmpty(subtaskList)) serviceSubtaskDiagnameList = serviceSubtaskService.convertToDiagnameList(subtaskList);
+ ExcelUtil<ServiceSubtaskDiagname> util = new ExcelUtil<ServiceSubtaskDiagname>(ServiceSubtaskDiagname.class);
if (active.equals("ls") || active.equals("druid")) {
- util.exportExcel(response, subtaskList, LocalDate.now().getMonthValue() + "闅忚缁熻瀵煎嚭");
+ util.exportExcel(response, serviceSubtaskDiagnameList, LocalDate.now().getMonthValue() + "闅忚缁熻瀵煎嚭");
} else {
- util.exportExcel(response, subtaskList, "闅忚缁熻瀵煎嚭");
+ util.exportExcel(response, serviceSubtaskDiagnameList, "闅忚缁熻瀵煎嚭");
}
}
-
/**
* 鏂板鎴栦慨鏀瑰垹闄ゅ崟涓�浠诲姟
@@ -432,10 +419,14 @@
ExcelUtil<ServiceSubtaskStatistic> util = new ExcelUtil<ServiceSubtaskStatistic>(ServiceSubtaskStatistic.class);
+ String sheetName = "";
+ String fileName = "";
if (active.equals("ls") || active.equals("druid")) {
- util.exportExcel(response, sfStatistics, LocalDate.now().getMonthValue() + "鏈堝嚭闄㈤殢璁跨粺璁¤〃");
+ fileName = sheetName = LocalDate.now().getMonthValue() + "鏈堝嚭闄㈤殢璁跨粺璁¤〃";
+ util.exportExcelWithFileName(response, sfStatistics, sheetName, fileName);
} else {
- util.exportExcel(response, sfStatistics, "闅忚缁熻瀵煎嚭");
+ sheetName = "闅忚缁熻瀵煎嚭";
+ util.exportExcel(response, sfStatistics, sheetName);
}
}
--
Gitblit v1.9.3