From 9bb7dcfc74c142fe1514cd2580cb6f0d64ca45fd Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 24 十二月 2024 10:28:30 +0800
Subject: [PATCH] merge
---
medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwCollectRecordServiceImpl.java | 42 ++++++++++++++++++++++--------------------
1 files changed, 22 insertions(+), 20 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 fd187a1..39c7571 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,11 +1,13 @@
package com.sinata.system.service.impl;
-import com.alibaba.excel.EasyExcel;
+import cn.idev.excel.EasyExcel;
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.SysDepartment;
+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.MwCollectRecordQuery;
import com.sinata.system.domain.vo.MedicalWasteProcessVO;
@@ -19,6 +21,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;
@@ -43,15 +47,9 @@
*/
@Override
public PageDTO<MwCollectRecordVO> pageList(MwCollectRecordQuery query) {
- String treeCode = "";
- if (Objects.isNull(query.getDepartmentId())) {
- SysDepartment myDepartment = sysDepartmentService.getMyDepartment();
- if (Objects.isNull(myDepartment)) {
- return PageDTO.empty(0L, 0L);
- }
- treeCode = myDepartment.getTreeCode();
- } else {
- treeCode = sysDepartmentService.getById(query.getDepartmentId()).getTreeCode();
+ String treeCode = sysDepartmentService.getTreeCodeByDepartmentId(query.getDepartmentId());
+ if (StringUtils.isBlank(treeCode)) {
+ return PageDTO.empty(0L, 0L);
}
Page<MwCollectRecordVO> page = baseMapper.pageList(new Page<>(query.getPageCurr(), query.getPageSize()), query, treeCode);
return PageDTO.of(page);
@@ -82,6 +80,11 @@
}
}
+ @Override
+ public List<CollectDto> getGroup(String boxNumber,Long departmentId) {
+ return this.baseMapper.getGroup(boxNumber,departmentId);
+ }
+
/**
* 流转过程
*
@@ -95,15 +98,9 @@
@Override
public void export(MwCollectRecordQuery query, HttpServletResponse response) throws IOException {
- String treeCode = "";
- if (Objects.isNull(query.getDepartmentId())) {
- SysDepartment myDepartment = sysDepartmentService.getMyDepartment();
- if (Objects.isNull(myDepartment)) {
- return;
- }
- treeCode = myDepartment.getTreeCode();
- } else {
- treeCode = sysDepartmentService.getById(query.getDepartmentId()).getTreeCode();
+ String treeCode = sysDepartmentService.getTreeCodeByDepartmentId(query.getDepartmentId());
+ if (StringUtils.isBlank(treeCode)) {
+ return;
}
List<MwCollectRecordVO> vo = baseMapper.getExportList(query, treeCode);
// 这里注意 有同学反应使用swagger 会导致各种问题，请直接用浏览器或者用postman
@@ -114,4 +111,9 @@
response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
EasyExcel.write(response.getOutputStream(), MwCollectRecordVO.class).sheet("医废收集记录").doWrite(vo);
}
+
+ @Override
+ public List<CollectTotalUpDto> collectTotal(LocalDate date,Long departmentId) {
+ return baseMapper.collectTotal(date,departmentId);
+ }
}
--
Gitblit v1.7.1