Browse Source

技术档案导出优化

XU 1 week ago
parent
commit
d4d7dee495

+ 1 - 0
src/main/java/thyyxxk/webserver/entity/technologyArchives/TechnologyArchivesMultiVo.java

@@ -14,6 +14,7 @@ import java.util.List;
 @Data
 public class TechnologyArchivesMultiVo {
 
+    private String text;
     private List<String> exportTypes;
     private List<String> exportNames;
 

+ 2 - 1
src/main/java/thyyxxk/webserver/service/technologyArchives/HLTechnologyArchivesService.java

@@ -1884,13 +1884,14 @@ public class HLTechnologyArchivesService {
         if (exportVo.getExportNames() == null || exportVo.getExportNames().size() != exportVo.getExportTypes().size()) {
             return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "每个导出类型必须对应一个名称");
         }
-
+        String text = exportVo.getText();
         // 遍历类型和名称
         for (int i = 0; i < exportVo.getExportTypes().size(); i++) {
             String textType = exportVo.getExportTypes().get(i);
             String exportName = exportVo.getExportNames().get(i); // 获取自定义名称
 
             TechnologyArchivesVo vo = new TechnologyArchivesVo();
+            vo.setText(text);
             vo.setTextType(textType);
             vo.setExportName(exportName); // 设置当前Sheet的名称
 

+ 4 - 2
src/main/java/thyyxxk/webserver/service/technologyArchives/TechnologyArchivesService.java

@@ -2077,7 +2077,7 @@ public class TechnologyArchivesService {
     /**
      * @param  exportVo (ExportTypes 文档类型 ExportNames 关键字)
      * @return map
-     * @Description 导出所有护理档案的信息
+     * @Description 导出所有档案的信息
      * @Author XU
      * @Date 2025/4/2
      */
@@ -2092,6 +2092,7 @@ public class TechnologyArchivesService {
         if (exportVo.getExportNames() == null || exportVo.getExportNames().size() != exportVo.getExportTypes().size()) {
             return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "每个导出类型必须对应一个名称");
         }
+        String text = exportVo.getText();
 
         // 遍历类型和名称
         for (int i = 0; i < exportVo.getExportTypes().size(); i++) {
@@ -2099,6 +2100,7 @@ public class TechnologyArchivesService {
             String exportName = exportVo.getExportNames().get(i); // 获取自定义名称
 
             TechnologyArchivesVo vo = new TechnologyArchivesVo();
+            vo.setText(text);
             vo.setTextType(textType);
             vo.setExportName(exportName); // 设置当前Sheet的名称
 
@@ -2119,7 +2121,7 @@ public class TechnologyArchivesService {
         }
 
         if (true) {
-            ExcelUtil.exportMultiSheetReport(response, sheets, "护理技术档案汇总报告.xls");
+            ExcelUtil.exportMultiSheetReport(response, sheets, "技术档案汇总报告.xls");
             return null;
         }