mirror of
http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git
synced 2026-08-12 21:02:08 +08:00
报表基础模块:1、新增通用预览下载接口内部调用接口修正;2、ureport的poi版本区别于dependencies;
This commit is contained in:
@@ -135,6 +135,11 @@
|
|||||||
<version>${commons-text.version}</version>
|
<version>${commons-text.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<!--ureport-core 相关start-->
|
<!--ureport-core 相关start-->
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.apache.poi</groupId>
|
||||||
|
<artifactId>poi</artifactId>
|
||||||
|
<version>${poi-ooxml.version}</version>
|
||||||
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.poi</groupId>
|
<groupId>org.apache.poi</groupId>
|
||||||
<artifactId>poi-ooxml-full</artifactId>
|
<artifactId>poi-ooxml-full</artifactId>
|
||||||
@@ -148,6 +153,10 @@
|
|||||||
<groupId>org.apache.poi</groupId>
|
<groupId>org.apache.poi</groupId>
|
||||||
<artifactId>poi-ooxml-lite</artifactId>
|
<artifactId>poi-ooxml-lite</artifactId>
|
||||||
</exclusion>
|
</exclusion>
|
||||||
|
<exclusion>
|
||||||
|
<artifactId>poi</artifactId>
|
||||||
|
<groupId>org.apache.poi</groupId>
|
||||||
|
</exclusion>
|
||||||
</exclusions>
|
</exclusions>
|
||||||
<version>${poi-ooxml.version}</version>
|
<version>${poi-ooxml.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|||||||
+2
-2
@@ -145,8 +145,8 @@ public class ReportTemplateController {
|
|||||||
@PostMapping("/template/download/{type}/common")
|
@PostMapping("/template/download/{type}/common")
|
||||||
@Operation(summary = "模板预览下载")
|
@Operation(summary = "模板预览下载")
|
||||||
@PreAuthorize("@ss.hasPermission('report:preview')")
|
@PreAuthorize("@ss.hasPermission('report:preview')")
|
||||||
public void commonPrint(@PathVariable @ReportTemplateProducerTypeInEnum @NotBlank(message = "模板下载类型不能为空") String type, @RequestBody ReportTemplatePreviewReqVO reqVO, HttpServletResponse response) {
|
public void commonPrint(@PathVariable @ReportTemplateProducerTypeInEnum @NotBlank(message = "模板下载类型不能为空") String type, @RequestBody ReportTemplateCommonPreviewReqVO reqVO, HttpServletResponse response) {
|
||||||
templateService.download(type, reqVO, response);
|
templateService.commonDownload(type, reqVO, response);
|
||||||
}
|
}
|
||||||
|
|
||||||
@PostMapping("/template/excel/import")
|
@PostMapping("/template/excel/import")
|
||||||
|
|||||||
Reference in New Issue
Block a user