From 1f5ef3a86b1227f49c6840b2205174e4ab2f0f14 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 27 三月 2025 15:49:37 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/boymi/YiFeiNN
---
medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwCheckoutRecordServiceImpl.java | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwCheckoutRecordServiceImpl.java b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwCheckoutRecordServiceImpl.java
index 92e6def..4ab84e4 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwCheckoutRecordServiceImpl.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwCheckoutRecordServiceImpl.java
@@ -9,6 +9,7 @@
import com.sinata.common.utils.CollUtils;
import com.sinata.common.utils.DateUtils;
import com.sinata.common.utils.StringUtils;
+import com.sinata.system.config.AutoColumnWidthStrategy;
import com.sinata.system.domain.MwCheckoutRecord;
import com.sinata.system.domain.dto.CollectTotalUpDto;
import com.sinata.system.domain.query.CheckoutRecordQuery;
@@ -16,6 +17,7 @@
import com.sinata.system.domain.query.MwCheckoutRecordItemQuery;
import com.sinata.system.domain.query.MwTransitRecordQuery;
import com.sinata.system.domain.query.TransformQuery;
+import com.sinata.system.domain.query.TransitRecordQuery;
import com.sinata.system.domain.vo.MwCheckoutRecordExcelVO;
import com.sinata.system.domain.vo.MwCheckoutRecordVO;
import com.sinata.system.domain.vo.MwCollectRecordVO;
@@ -33,7 +35,6 @@
import java.io.IOException;
import java.net.URLEncoder;
import java.time.LocalDate;
-import java.util.Collections;
import java.util.List;
/**
@@ -85,7 +86,10 @@
// 这里URLEncoder.encode可以防止中文乱码 当然和easyexcel没有关系
String fileName = URLEncoder.encode("转运记录", "UTF-8").replaceAll("\\+", "%20");
response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
- FastExcel.write(response.getOutputStream(), MwCheckoutRecordExcelVO.class).sheet("转运记录").doWrite(mwCheckoutRecordExcelVOS);
+ FastExcel.write(response.getOutputStream(), MwCheckoutRecordExcelVO.class)
+ .registerWriteHandler(new AutoColumnWidthStrategy())
+ .sheet("转运记录")
+ .doWrite(mwCheckoutRecordExcelVOS);
}
@Override
@@ -97,8 +101,8 @@
return this.baseMapper.totalUp4(departmentId);
}
@Override
- public List<CollectTotalUpDto> totalUp2(LocalDate date1,LocalDate date2, Long departmentId) {
- return this.baseMapper.totalUp2(date1,date2,departmentId);
+ public List<CollectTotalUpDto> totalUp2(LocalDate date,Long departmentId) {
+ return this.baseMapper.totalUp2(date,departmentId);
}
@Override
public List<CollectTotalUpDto> totalUp5( Long departmentId) {
@@ -171,8 +175,8 @@
* @return
*/
@Override
- public MwTransitRecordVO transitDetail(Long id) {
- return baseMapper.transitDetail(id);
+ public MwTransitRecordVO transitDetail(TransitRecordQuery query) {
+ return baseMapper.transitDetail(query);
}
/**
@@ -182,8 +186,8 @@
* @return
*/
@Override
- public PageDTO<MwMedicalWasteBoxVO> transitDetailPageList(MwTransitRecordQuery query) {
- Page<MwMedicalWasteBoxVO> page = baseMapper.transitDetailPageList(new Page<>(query.getPageCurr(), query.getPageSize()), query.getId());
+ public PageDTO<MwMedicalWasteBoxVO> transitDetailPageList(TransitRecordQuery query) {
+ Page<MwMedicalWasteBoxVO> page = baseMapper.transitDetailPageList(new Page<>(query.getPageCurr(), query.getPageSize()), query);
return PageDTO.of(page);
}
--
Gitblit v1.7.1