From 7dff38876f582644ae95daad8ac21d4f57088d56 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期六, 28 十二月 2024 16:19:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwCheckoutRecordServiceImpl.java |   53 ++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 48 insertions(+), 5 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 e27052e..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
@@ -1,19 +1,24 @@
 package com.sinata.system.service.impl;
 
-import cn.idev.excel.EasyExcel;
+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.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;
 import com.sinata.system.domain.query.MwTransitRecordQuery;
+import com.sinata.system.domain.query.TransformQuery;
 import com.sinata.system.domain.vo.MwCheckoutRecordExcelVO;
 import com.sinata.system.domain.vo.MwCheckoutRecordVO;
+import com.sinata.system.domain.vo.MwCollectRecordVO;
 import com.sinata.system.domain.vo.MwMedicalWasteBoxVO;
 import com.sinata.system.domain.vo.MwTransitRecordVO;
+import com.sinata.system.domain.vo.TransformVO;
 import com.sinata.system.mapper.MwCheckoutRecordMapper;
 import com.sinata.system.service.MwCheckoutRecordService;
 import com.sinata.system.service.SysDepartmentService;
@@ -23,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;
 
 /**
@@ -46,7 +53,7 @@
      */
     @Override
     public PageDTO<MwCheckoutRecordVO> pageHospitalTransitList(CheckoutRecordQuery query) {
-        String treeCode = sysDepartmentService.getTreeCode(query.getDepartmentId());
+        String treeCode = sysDepartmentService.getTreeCodeByDepartmentId(query.getDepartmentId());
         if (StringUtils.isBlank(treeCode)) {
             return PageDTO.empty(0L, 0L);
         }
@@ -62,7 +69,7 @@
      */
     @Override
     public void checkoutRecordExport(CheckoutRecordQuery query, HttpServletResponse response) throws IOException {
-        String treeCode = sysDepartmentService.getTreeCode(query.getDepartmentId());
+        String treeCode = sysDepartmentService.getTreeCodeByDepartmentId(query.getDepartmentId());
         if (StringUtils.isBlank(treeCode)) {
             return;
         }
@@ -74,7 +81,16 @@
         // 这里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(), MwCheckoutRecordExcelVO.class).sheet("转运记录").doWrite(mwCheckoutRecordExcelVOS);
+        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);
     }
 
     /**
@@ -108,7 +124,10 @@
      */
     @Override
     public PageDTO<MwTransitRecordVO> transitPageList(MwTransitRecordQuery query) {
-        String treeCode = sysDepartmentService.getTreeCode(query.getDepartmentId());
+        String treeCode = sysDepartmentService.getTreeCodeByDepartmentId(query.getDepartmentId());
+        if (StringUtils.isBlank(treeCode)) {
+            return PageDTO.empty(0L, 0L);
+        }
         Page<MwTransitRecordVO> page = baseMapper.transitPageList(new Page<>(query.getPageCurr(), query.getPageSize()), query, treeCode);
         return PageDTO.of(page);
     }
@@ -135,4 +154,28 @@
         Page<MwMedicalWasteBoxVO> page = baseMapper.transitDetailPageList(new Page<>(query.getPageCurr(), query.getPageSize()), query.getId());
         return PageDTO.of(page);
     }
+
+    /**
+     * 转移联单数据
+     *
+     * @param query
+     * @param treeCode
+     * @return
+     */
+    @Override
+    public List<TransformVO> getCheckoutRecordList(TransformQuery query, String treeCode) {
+        return baseMapper.getCheckoutRecordList(query, treeCode);
+    }
+
+    /**
+     * 监管报表医疗废物转移列表
+     *
+     * @param query
+     * @return
+     */
+    @Override
+    public List<MwCollectRecordVO> getRegulationReportList(DisposalReportQuery query) {
+        String treeCode = sysDepartmentService.getTreeCodeByDepartmentId(query.getDepartmentId());
+        return baseMapper.getRegulationReportList(query, treeCode);
+    }
 }

--
Gitblit v1.7.1