From 2f3d3fb97bd4ebdc00c40a2774465c8b3487b6d1 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 02 四月 2025 17:14:27 +0800
Subject: [PATCH] bug修改
---
medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwCheckoutRecordServiceImpl.java | 41 ++++++++++++++++++++++++++++++-----------
1 files changed, 30 insertions(+), 11 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 b189014..143f6cf 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
@@ -1,11 +1,15 @@
package com.sinata.system.service.impl;
+import cn.hutool.core.date.DateUtil;
import cn.idev.excel.FastExcel;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.sinata.common.entity.PageDTO;
import com.sinata.common.utils.BeanUtils;
+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;
@@ -13,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;
@@ -30,7 +35,6 @@
import java.io.IOException;
import java.net.URLEncoder;
import java.time.LocalDate;
-import java.util.Collections;
import java.util.List;
/**
@@ -82,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
@@ -94,8 +101,12 @@
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> totalUp22(LocalDate date,Long departmentId) {
+ return this.baseMapper.totalUp22(date,departmentId);
}
@Override
public List<CollectTotalUpDto> totalUp5( Long departmentId) {
@@ -117,12 +128,12 @@
/**
* 转运记录详情
*
- * @param departmentId
+ * @param id
* @return
*/
@Override
- public MwCheckoutRecordVO hospitalDetail(Long departmentId) {
- return baseMapper.hospitalDetail(departmentId);
+ public MwCheckoutRecordVO hospitalDetail(Long id) {
+ return baseMapper.hospitalDetail(id);
}
/**
@@ -149,6 +160,14 @@
if (StringUtils.isBlank(treeCode)) {
return PageDTO.empty(0L, 0L);
}
+ if (CollUtils.isNotEmpty(query.getStartTime())) {
+ query.setStartTimeStart(DateUtil.parse(query.getStartTime().get(0), DateUtils.YYYY_MM_DD_HH_MM_SS));
+ query.setStartTimeEnd(DateUtil.parse(query.getStartTime().get(1), DateUtils.YYYY_MM_DD_HH_MM_SS));
+ }
+ if (CollUtils.isNotEmpty(query.getEndTime())) {
+ query.setEndTimeStart(DateUtil.parse(query.getEndTime().get(0), DateUtils.YYYY_MM_DD_HH_MM_SS));
+ query.setEndTimeEnd(DateUtil.parse(query.getEndTime().get(1), DateUtils.YYYY_MM_DD_HH_MM_SS));
+ }
Page<MwTransitRecordVO> page = baseMapper.transitPageList(new Page<>(query.getPageCurr(), query.getPageSize()), query, treeCode);
return PageDTO.of(page);
}
@@ -160,8 +179,8 @@
* @return
*/
@Override
- public MwTransitRecordVO transitDetail(Long id) {
- return baseMapper.transitDetail(id);
+ public MwTransitRecordVO transitDetail(TransitRecordQuery query) {
+ return baseMapper.transitDetail(query);
}
/**
@@ -171,8 +190,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