From 5ffd6daaa60a0682434af9484f7bc819b155ac3a Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Fri, 14 Feb 2025 14:42:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=9F=BA=E7=A1=80=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=EF=BC=9A1=E3=80=81=E6=96=B0=E5=A2=9E=E9=80=9A?=
 =?UTF-8?q?=E7=94=A8=E9=A2=84=E8=A7=88=E4=B8=8B=E8=BD=BD=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=86=85=E9=83=A8=E8=B0=83=E7=94=A8=E6=8E=A5=E5=8F=A3=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3=EF=BC=9B2=E3=80=81ureport=E7=9A=84poi=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=8C=BA=E5=88=AB=E4=BA=8Edependencies=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cf-module-report/cf-module-report-biz/pom.xml            | 9 +++++++++
 .../admin/template/ReportTemplateController.java         | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/cf-module-report/cf-module-report-biz/pom.xml b/cf-module-report/cf-module-report-biz/pom.xml
index eded7e7c2..37b870edc 100644
--- a/cf-module-report/cf-module-report-biz/pom.xml
+++ b/cf-module-report/cf-module-report-biz/pom.xml
@@ -135,6 +135,11 @@
             <version>${commons-text.version}</version>
         </dependency>
         <!--ureport-core 相关start-->
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi</artifactId>
+            <version>${poi-ooxml.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi-ooxml-full</artifactId>
@@ -148,6 +153,10 @@
                     <groupId>org.apache.poi</groupId>
                     <artifactId>poi-ooxml-lite</artifactId>
                 </exclusion>
+                <exclusion>
+                    <artifactId>poi</artifactId>
+                    <groupId>org.apache.poi</groupId>
+                </exclusion>
             </exclusions>
             <version>${poi-ooxml.version}</version>
         </dependency>
diff --git a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/ReportTemplateController.java b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/ReportTemplateController.java
index d93a59fb3..18122242d 100644
--- a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/ReportTemplateController.java
+++ b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/controller/admin/template/ReportTemplateController.java
@@ -145,8 +145,8 @@ public class ReportTemplateController {
     @PostMapping("/template/download/{type}/common")
     @Operation(summary = "模板预览下载")
     @PreAuthorize("@ss.hasPermission('report:preview')")
-    public void commonPrint(@PathVariable @ReportTemplateProducerTypeInEnum @NotBlank(message = "模板下载类型不能为空") String type, @RequestBody ReportTemplatePreviewReqVO reqVO, HttpServletResponse response) {
-        templateService.download(type, reqVO, response);
+    public void commonPrint(@PathVariable @ReportTemplateProducerTypeInEnum @NotBlank(message = "模板下载类型不能为空") String type, @RequestBody ReportTemplateCommonPreviewReqVO reqVO, HttpServletResponse response) {
+        templateService.commonDownload(type, reqVO, response);
     }
 
     @PostMapping("/template/excel/import")