From 2dc478231fd09a88a4d86d44388ae807aca08bc5 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 01 一月 2025 10:14:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwCollectRecordServiceImpl.java |   80 +++++++++++++++++++++++++++++++++++++++-
 1 files changed, 78 insertions(+), 2 deletions(-)

diff --git a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwCollectRecordServiceImpl.java b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwCollectRecordServiceImpl.java
index 07b8a98..00ddb23 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwCollectRecordServiceImpl.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwCollectRecordServiceImpl.java
@@ -1,15 +1,20 @@
 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.StringUtils;
 import com.sinata.system.domain.MwCollectRecord;
+import com.sinata.system.domain.dto.CollectCarTotalUpDto;
+import com.sinata.system.domain.dto.CollectDto;
+import com.sinata.system.domain.dto.CollectTotalUpDto;
 import com.sinata.system.domain.dto.MwCollectRecordDTO;
+import com.sinata.system.domain.query.DisposalReportQuery;
 import com.sinata.system.domain.query.MwCollectRecordQuery;
 import com.sinata.system.domain.vo.MedicalWasteProcessVO;
 import com.sinata.system.domain.vo.MwCollectRecordVO;
+import com.sinata.system.domain.vo.MwCollectRecordWarningVO;
 import com.sinata.system.mapper.MwCollectRecordMapper;
 import com.sinata.system.service.MwCollectRecordService;
 import com.sinata.system.service.SysDepartmentService;
@@ -19,6 +24,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;
 import java.util.Objects;
 
@@ -76,6 +83,20 @@
         }
     }
 
+    @Override
+    public List<CollectDto> getGroup(String boxNumber,Long departmentId) {
+        return this.baseMapper.getGroup(boxNumber,departmentId);
+    }
+    @Override
+    public List<CollectDto> getGroupWithStatus(String boxNumber,Long departmentId,Integer status) {
+        return this.baseMapper.getGroupWithStatus(boxNumber,departmentId,status);
+    }
+
+    @Override
+    public List<CollectDto> getGroup1(String boxNumber,Long departmentId) {
+        return this.baseMapper.getGroup1(boxNumber,departmentId);
+    }
+
     /**
      * 流转过程
      *
@@ -100,6 +121,61 @@
         // 这里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(vo);
+        FastExcel.write(response.getOutputStream(), MwCollectRecordVO.class).sheet("医废收集记录").doWrite(vo);
+    }
+
+    /**
+     * 监管报表医疗废物产生列表
+     *
+     * @param query
+     * @return
+     */
+    @Override
+    public List<MwCollectRecordVO> getRegulationReportList(DisposalReportQuery query) {
+        String treeCode = sysDepartmentService.getTreeCodeByDepartmentId(query.getDepartmentId());
+        return baseMapper.getRegulationReportList(query, treeCode);
+    }
+
+    @Override
+    public List<CollectTotalUpDto> collectTotal(LocalDate date,Long departmentId) {
+        return baseMapper.collectTotal(date,departmentId);
+    }
+    @Override
+    public List<CollectTotalUpDto> collectTotal3(Long departmentId) {
+        return baseMapper.collectTotal3(departmentId);
+    }
+    @Override
+    public List<CollectTotalUpDto> collectTotal1(LocalDate date,Long checkOutUserId,Long id ) {
+        return baseMapper.collectTotal1(date,checkOutUserId,id);
+    }
+
+    @Override
+    public List<CollectCarTotalUpDto> carGroup(Long carId) {
+        return this.baseMapper.carGroup(carId);
+    }
+
+    /**
+     * 查询日产废记录
+     *
+     * @return
+     */
+    @Override
+    public List<MwCollectRecordWarningVO> queryListByDay() {
+        return baseMapper.queryListTimeType(1);
+    }
+
+    /**
+     * 查询月产废记录
+     *
+     * @return
+     */
+    @Override
+    public List<MwCollectRecordWarningVO> queryListByMonth() {
+        return baseMapper.queryListTimeType(2);
+    }
+
+    @Override
+    public List<MwCollectRecordWarningVO> queryListGroupByDepartment() {
+        return baseMapper.queryListGroupByDepartment();
     }
 }

--
Gitblit v1.7.1