From fc27f5b8b32157e6037be26f9076020c756cfacc Mon Sep 17 00:00:00 2001
From: lst <lst@peony.cn>
Date: Mon, 15 Jul 2024 13:36:25 +0800
Subject: [PATCH] 项目库下载

---
 backend/chkpower/pom.xml                                                                              | 1 +
 backend/chkpower/src/main/java/com/hotent/chkpower/controller/WProjectLibraryInventoryController.java | 5 +++--
 backend/chkpower/src/main/resources/doc/project_down.xls                                              | Bin 21504 -> 0 bytes
 backend/chkpower/src/main/resources/doc/project_down.xlsx                                             | Bin 0 -> 10877 bytes
 4 files changed, 4 insertions(+), 2 deletions(-)
 delete mode 100644 backend/chkpower/src/main/resources/doc/project_down.xls
 create mode 100644 backend/chkpower/src/main/resources/doc/project_down.xlsx

diff --git a/backend/chkpower/pom.xml b/backend/chkpower/pom.xml
index ceff883..c1d12ef 100644
--- a/backend/chkpower/pom.xml
+++ b/backend/chkpower/pom.xml
@@ -127,6 +127,7 @@
                 <configuration>
                     <nonFilteredFileExtensions>
                         <nonFilteredFileExtension>xls</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>xlsx</nonFilteredFileExtension>
                     </nonFilteredFileExtensions>
                 </configuration>
             </plugin>
diff --git a/backend/chkpower/src/main/java/com/hotent/chkpower/controller/WProjectLibraryInventoryController.java b/backend/chkpower/src/main/java/com/hotent/chkpower/controller/WProjectLibraryInventoryController.java
index 8835770..3d3d669 100644
--- a/backend/chkpower/src/main/java/com/hotent/chkpower/controller/WProjectLibraryInventoryController.java
+++ b/backend/chkpower/src/main/java/com/hotent/chkpower/controller/WProjectLibraryInventoryController.java
@@ -65,6 +65,7 @@ public class WProjectLibraryInventoryController extends BaseController<WProjectL
     }
 
     @GetMapping("/down")
+    @ApiOperation(value = "项目库导出", httpMethod = "GET", notes = "项目库导出：根据查询条件导出Excle表格")
     public void down(HttpServletResponse response, WProjectLibraryInventory wProjectLibraryInventory) throws Exception {
         QueryWrapper<WProjectLibraryInventory> queryWrapper = new QueryWrapper<>();
         if (ObjectUtils.isNotEmpty(wProjectLibraryInventory.getFProjectNo())) {
@@ -136,10 +137,10 @@ public class WProjectLibraryInventoryController extends BaseController<WProjectL
         }
         map.put("list", hashMaps);
 
-        TemplateExportParams params = new TemplateExportParams("doc/project_down.xls");
+        TemplateExportParams params = new TemplateExportParams("doc/project_down.xlsx");
         params.setColForEach(true);
         Workbook workbook = ExcelExportUtil.exportExcel(params, map);
-        String filedisplay = "项目填报" + LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd")) + ".xls";
+        String filedisplay = "项目库填写" + LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd")) + ".xlsx";
         response.setContentType("APPLICATION/OCTET-STREAM");
         response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");
         response.addHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(filedisplay, "utf-8"));
diff --git a/backend/chkpower/src/main/resources/doc/project_down.xls b/backend/chkpower/src/main/resources/doc/project_down.xls
deleted file mode 100644
index 9685e5d..0000000
Binary files a/backend/chkpower/src/main/resources/doc/project_down.xls and /dev/null differ
diff --git a/backend/chkpower/src/main/resources/doc/project_down.xlsx b/backend/chkpower/src/main/resources/doc/project_down.xlsx
new file mode 100644
index 0000000..04834cb
Binary files /dev/null and b/backend/chkpower/src/main/resources/doc/project_down.xlsx differ
--
libgit2 0.21.2