From d89a42213b4a32535e93185dedf41fe7a7fc1940 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 04 四月 2025 01:57:13 +0800
Subject: [PATCH] bug修改

---
 medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwMicroEquipmentRecordServiceImpl.java |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwMicroEquipmentRecordServiceImpl.java b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwMicroEquipmentRecordServiceImpl.java
index 2b6976d..89f29ce 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwMicroEquipmentRecordServiceImpl.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwMicroEquipmentRecordServiceImpl.java
@@ -12,6 +12,7 @@
 import com.sinata.common.utils.DateUtils;
 import com.sinata.common.utils.SecurityUtils;
 import com.sinata.common.utils.StringUtils;
+import com.sinata.system.config.AutoColumnWidthEntityStrategy;
 import com.sinata.system.config.AutoColumnWidthStrategy;
 import com.sinata.system.domain.MwCollectRecord;
 import com.sinata.system.domain.MwMicroEquipment;
@@ -23,7 +24,6 @@
 import com.sinata.system.domain.query.MwMicroEquipmentStaticsQuery;
 import com.sinata.system.domain.vo.DepartmentReportItemVO;
 import com.sinata.system.domain.vo.DepartmentReportVO;
-import com.sinata.system.domain.vo.MwCollectRecordVO;
 import com.sinata.system.domain.vo.MwMicroEquipmentRecordVO;
 import com.sinata.system.domain.vo.MwMicroEquipmentStaticsTitleVO;
 import com.sinata.system.domain.vo.MwMicroEquipmentStaticsVO;
@@ -117,11 +117,11 @@
         response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
         response.setCharacterEncoding("utf-8");
         // 这里URLEncoder.encode可以防止中文乱码 当然和easyexcel没有关系
-        String fileName = URLEncoder.encode("微波设备使用记录", "UTF-8").replaceAll("\\+", "%20");
+        String fileName = URLEncoder.encode("小型微波设备使用记录", "UTF-8").replaceAll("\\+", "%20");
         response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
-        FastExcel.write(response.getOutputStream(), MwCollectRecordVO.class)
-                .registerWriteHandler(new AutoColumnWidthStrategy())
-                .sheet("微波设备使用记录").doWrite(list);
+        FastExcel.write(response.getOutputStream(), MwMicroEquipmentRecordVO.class)
+                .registerWriteHandler(new AutoColumnWidthEntityStrategy())
+                .sheet("小型微波设备使用记录").doWrite(list);
     }
 
     /**
@@ -370,8 +370,8 @@
         headTitles.add(Lists.newArrayList(title, "日期", "日期"));
         String finalTitle = title;
         medicalWasteTypeList.forEach(item -> {
-            headTitles.add(Lists.newArrayList(finalTitle, item.getDictLabel(), "总重量(KG)"));
             headTitles.add(Lists.newArrayList(finalTitle, item.getDictLabel(), "总数量"));
+            headTitles.add(Lists.newArrayList(finalTitle, item.getDictLabel(), "总重量(kg)"));
         });
         headTitles.add(Lists.newArrayList(title, "小计", "总重量(KG)"));
         headTitles.add(Lists.newArrayList(title, "小计", "总数量"));

--
Gitblit v1.7.1