From 3115d589ca3faaecda604e2a66fe193a93ba9cbc Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期一, 30 十二月 2024 21:42:57 +0800 Subject: [PATCH] 1.bug修改 2.出库超时预警定时任务 --- medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwMicroEquipmentRecordServiceImpl.java | 9 ++++++--- 1 files changed, 6 insertions(+), 3 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 3c33577..5814221 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 @@ -1,6 +1,6 @@ package com.sinata.system.service.impl; -import cn.idev.excel.EasyExcel; +import cn.idev.excel.FastExcel; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -92,7 +92,7 @@ // 这里URLEncoder.encode可以防止中文乱码 当然和easyexcel没有关系 String fileName = URLEncoder.encode("微波设备使用记录", "UTF-8").replaceAll("\\+", "%20"); response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); - EasyExcel.write(response.getOutputStream(), MwCollectRecordVO.class).sheet("微波设备使用记录").doWrite(list); + FastExcel.write(response.getOutputStream(), MwCollectRecordVO.class).sheet("微波设备使用记录").doWrite(list); } /** @@ -180,10 +180,13 @@ switch (query.getDateType()) { case 1: sdf = new SimpleDateFormat(DateUtils.YYYY_MM_DD); + break; case 2: sdf = new SimpleDateFormat(DateUtils.YYYY_MM); + break; case 3: sdf = new SimpleDateFormat(DateUtils.YYYY); + break; } List<String> dateList = DateUtils.getDayBetween(query.getStartTime(), query.getEndTime(), query.getDateType()); List<List<String>> result = new ArrayList<>(); @@ -223,7 +226,7 @@ String fileName = URLEncoder.encode("处置分析报表", "UTF-8").replaceAll("\\+", "%20"); response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); // 这里需要设置不关闭流 - EasyExcel.write(response.getOutputStream()) + FastExcel.write(response.getOutputStream()) .head(head) .autoCloseStream(Boolean.TRUE) .sheet("处置分析报表") -- Gitblit v1.7.1