From 861d0de9a80cfc5fe8edf0eb0d62e1eb7e85b427 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期日, 26 一月 2025 18:03:12 +0800
Subject: [PATCH] 1.bug修改
---
medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwStagingRoomServiceImpl.java | 129 +++++++++++++++++++++++++++++++++++++++----
1 files changed, 117 insertions(+), 12 deletions(-)
diff --git a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwStagingRoomServiceImpl.java b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwStagingRoomServiceImpl.java
index f687b10..0856fe6 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwStagingRoomServiceImpl.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwStagingRoomServiceImpl.java
@@ -1,23 +1,32 @@
package com.sinata.system.service.impl;
+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.exception.ServiceException;
import com.sinata.common.utils.BeanUtils;
+import com.sinata.common.utils.StringUtils;
import com.sinata.system.domain.MwStagingRoom;
-import com.sinata.system.domain.SysDepartment;
import com.sinata.system.domain.dto.MwStagingRoomDTO;
+import com.sinata.system.domain.excel.MwCheckoutRecordExcel;
+import com.sinata.system.domain.query.CheckoutRecordQuery;
import com.sinata.system.domain.query.MwStagingRoomQuery;
import com.sinata.system.domain.query.StorageRecordQuery;
-import com.sinata.system.domain.vo.MwCollectRecordVO;
+import com.sinata.system.domain.vo.MwCheckoutRecordVO;
import com.sinata.system.domain.vo.MwStagingRoomVO;
+import com.sinata.system.domain.vo.MwStorageRecordVO;
import com.sinata.system.mapper.MwStagingRoomMapper;
import com.sinata.system.service.MwStagingRoomService;
import com.sinata.system.service.SysDepartmentService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.net.URL;
+import java.net.URLEncoder;
+import java.util.List;
import java.util.Objects;
/**
@@ -41,15 +50,11 @@
*/
@Override
public PageDTO<MwStagingRoomVO> pageList(MwStagingRoomQuery query) {
- String treeCode = "";
- if (Objects.nonNull(query.getDepartmentId())) {
- SysDepartment department = sysDepartmentService.getById(query.getDepartmentId());
- if (Objects.isNull(department)) {
- return PageDTO.empty(0L, 0L);
- }
- treeCode = department.getTreeCode();
+ String treeCode = sysDepartmentService.getTreeCodeByDepartmentId(query.getDepartmentId());
+ if (StringUtils.isBlank(treeCode)) {
+ return PageDTO.empty(0L, 0L);
}
- Page<MwStagingRoomVO> page = baseMapper.pagelist(new Page<>(query.getPageCurr(), query.getPageSize()), query.getDepartmentId(), treeCode);
+ Page<MwStagingRoomVO> page = baseMapper.pageList(new Page<>(query.getPageCurr(), query.getPageSize()), treeCode);
return PageDTO.of(page);
}
@@ -80,6 +85,8 @@
if (Objects.isNull(dto.getId())) {
throw new ServiceException("暂存间id不能为空");
}
+ MwStagingRoom mwStagingRoom = BeanUtils.copyBean(dto, MwStagingRoom.class);
+ updateById(mwStagingRoom);
}
/**
@@ -101,7 +108,105 @@
* @return
*/
@Override
- public PageDTO<MwCollectRecordVO> storageRecord(StorageRecordQuery query) {
- return null;
+ public PageDTO<MwStorageRecordVO> storageRecord(StorageRecordQuery query) {
+ String treeCode = sysDepartmentService.getTreeCodeByDepartmentId(query.getDepartmentId());
+ if (StringUtils.isBlank(treeCode)) {
+ return PageDTO.empty(0L, 0L);
+ }
+ Page<MwStorageRecordVO> page = baseMapper.storageRecordPage(new Page<>(query.getPageCurr(), query.getPageSize()), query, treeCode);
+ return PageDTO.of(page);
+ }
+
+ /**
+ * 暂存间入库记录导出
+ *
+ * @param query
+ * @param response
+ */
+ @Override
+ public void storageRecordExport(StorageRecordQuery query, HttpServletResponse response) throws IOException {
+ String treeCode = sysDepartmentService.getTreeCodeByDepartmentId(query.getDepartmentId());
+ if (StringUtils.isBlank(treeCode)) {
+ return;
+ }
+ List<MwStorageRecordVO> list = baseMapper.storageRecordList(query, treeCode);
+ // 这里注意 有同学反应使用swagger 会导致各种问题，请直接用浏览器或者用postman
+ response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+ response.setCharacterEncoding("utf-8");
+ // 这里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(), MwStorageRecordVO.class).sheet("暂存间入库记录").doWrite(list);
+ }
+
+ /**
+ * 暂存间出库记录
+ *
+ * @param query
+ * @return
+ */
+ @Override
+ public PageDTO<MwCheckoutRecordVO> checkoutRecord(CheckoutRecordQuery query) {
+ String treeCode = sysDepartmentService.getTreeCodeByDepartmentId(query.getDepartmentId());
+ if (StringUtils.isBlank(treeCode)) {
+ return PageDTO.empty(0L, 0L);
+ }
+ Page<MwCheckoutRecordVO> page = baseMapper.checkoutRecordPage(new Page<>(query.getPageCurr(), query.getPageSize()), query, treeCode);
+ return PageDTO.of(page);
+ }
+
+ /**
+ * 暂存间出库记录导出
+ *
+ * @param query
+ * @param response
+ */
+ @Override
+ public void checkoutRecordExport(CheckoutRecordQuery query, HttpServletResponse response) throws IOException {
+ String treeCode = sysDepartmentService.getTreeCodeByDepartmentId(query.getDepartmentId());
+ if (StringUtils.isBlank(treeCode)) {
+ return;
+ }
+ List<MwCheckoutRecordVO> list = baseMapper.checkoutRecordList(query, treeCode);
+ List<MwCheckoutRecordExcel> mwCheckoutRecordExcels = BeanUtils.copyToList(list, MwCheckoutRecordExcel.class);
+ for (MwCheckoutRecordExcel mwCheckoutRecordExcel : mwCheckoutRecordExcels) {
+ for (MwCheckoutRecordVO mwCheckoutRecordVO : list) {
+ if (mwCheckoutRecordVO.getId().equals(mwCheckoutRecordExcel.getId())) {
+ mwCheckoutRecordExcel.setHospitalSignature(new URL(mwCheckoutRecordVO.getHospitalSignature()));
+ }
+ }
+ }
+ response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+ response.setCharacterEncoding("utf-8");
+ String fileName = URLEncoder.encode("暂存间出库记录", "UTF-8").replaceAll("\\+", "%20");
+ response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
+ FastExcel.write(response.getOutputStream(), MwCheckoutRecordExcel.class).sheet("暂存间出库记录").doWrite(mwCheckoutRecordExcels);
+ }
+
+ @Override
+ public List<MwStagingRoomVO> queryStagingRoomList() {
+ return baseMapper.queryStagingRoomList();
+ }
+
+ /**
+ * 暂存间待处理医废分页列表
+ *
+ * @param query
+ * @return
+ */
+ @Override
+ public PageDTO<MwStorageRecordVO> temporarilyStoredMedicalWaste(StorageRecordQuery query) {
+ return PageDTO.of(baseMapper.temporarilyStoredMedicalWaste(new Page<MwStorageRecordVO>(query.getPageCurr(), query.getPageSize()), query));
+ }
+
+ /**
+ * 根据医废查询使用列表
+ *
+ * @param id 微波设备id
+ * @return
+ */
+ @Override
+ public List<MwStorageRecordVO> queryMedicalWasteList(Long id) {
+ return baseMapper.queryMedicalWasteList(id);
}
}
--
Gitblit v1.7.1