From 73a0ffbc8f1c5c625ce4bb3225c0e5e30179520e Mon Sep 17 00:00:00 2001 From: luodangjia <luodangjia> Date: 星期六, 28 十二月 2024 17:42:44 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwCheckoutRecordServiceImpl.java | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 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 418dbbd..0983583 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 @@ -7,6 +7,7 @@ import com.sinata.common.utils.BeanUtils; import com.sinata.common.utils.StringUtils; import com.sinata.system.domain.MwCheckoutRecord; +import com.sinata.system.domain.dto.CollectTotalUpDto; import com.sinata.system.domain.query.CheckoutRecordQuery; import com.sinata.system.domain.query.DisposalReportQuery; import com.sinata.system.domain.query.MwCheckoutRecordItemQuery; @@ -27,6 +28,8 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.net.URLEncoder; +import java.time.LocalDate; +import java.util.Collections; import java.util.List; /** @@ -81,6 +84,15 @@ FastExcel.write(response.getOutputStream(), MwCheckoutRecordExcelVO.class).sheet("转运记录").doWrite(mwCheckoutRecordExcelVOS); } + @Override + public List<CollectTotalUpDto> totalUp(LocalDate date, Long departmentId) { + return this.baseMapper.totalUp(date,departmentId); + } + @Override + public List<CollectTotalUpDto> totalUp1( Long outId) { + return this.baseMapper.totalUp1(outId); + } + /** * 转运记录详情 * -- Gitblit v1.7.1