From ab7b8b5e702989d894620c41fbaa0e2d6904ecd5 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 17 十二月 2024 19:09:03 +0800
Subject: [PATCH] 处置管理接口
---
medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwStagingRoomServiceImpl.java | 64 ++++++++-----------------------
1 files changed, 17 insertions(+), 47 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 9676585..c0c312f 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,13 +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.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.query.CheckoutRecordQuery;
import com.sinata.system.domain.query.MwStagingRoomQuery;
@@ -48,15 +48,9 @@
*/
@Override
public PageDTO<MwStagingRoomVO> pageList(MwStagingRoomQuery 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 if (Objects.nonNull(query.getDepartmentId())) {
- treeCode = sysDepartmentService.getById(query.getDepartmentId()).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()), treeCode);
return PageDTO.of(page);
@@ -111,15 +105,9 @@
*/
@Override
public PageDTO<MwStorageRecordVO> storageRecord(StorageRecordQuery query) {
- String treeCode = "";
- if (Objects.isNull(query.getDepartmentId()) && Objects.isNull(query.getStagingRoomId())) {
- SysDepartment myDepartment = sysDepartmentService.getMyDepartment();
- if (Objects.isNull(myDepartment)) {
- return PageDTO.empty(0L, 0L);
- }
- treeCode = myDepartment.getTreeCode();
- } else if (Objects.nonNull(query.getDepartmentId()) && Objects.isNull(query.getStagingRoomId())) {
- treeCode = sysDepartmentService.getById(query.getDepartmentId()).getTreeCode();
+ 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);
@@ -133,15 +121,9 @@
*/
@Override
public void storageRecordExport(StorageRecordQuery query, HttpServletResponse response) throws IOException {
- String treeCode = "";
- if (Objects.isNull(query.getDepartmentId()) && Objects.isNull(query.getStagingRoomId())) {
- SysDepartment myDepartment = sysDepartmentService.getMyDepartment();
- if (Objects.isNull(myDepartment)) {
- return;
- }
- treeCode = myDepartment.getTreeCode();
- } else if (Objects.nonNull(query.getDepartmentId()) && Objects.isNull(query.getStagingRoomId())) {
- treeCode = sysDepartmentService.getById(query.getDepartmentId()).getTreeCode();
+ String treeCode = sysDepartmentService.getTreeCodeByDepartmentId(query.getDepartmentId());
+ if (StringUtils.isBlank(treeCode)) {
+ return;
}
List<MwStorageRecordVO> list = baseMapper.storageRecordList(query, treeCode);
// 这里注意 有同学反应使用swagger 会导致各种问题，请直接用浏览器或者用postman
@@ -161,15 +143,9 @@
*/
@Override
public PageDTO<MwCheckoutRecordVO> checkoutRecord(CheckoutRecordQuery query) {
- String treeCode = "";
- if (Objects.isNull(query.getDepartmentId()) && Objects.isNull(query.getStagingRoomId())) {
- SysDepartment myDepartment = sysDepartmentService.getMyDepartment();
- if (Objects.isNull(myDepartment)) {
- return PageDTO.empty(0L, 0L);
- }
- treeCode = myDepartment.getTreeCode();
- } else if (Objects.nonNull(query.getDepartmentId()) && Objects.isNull(query.getStagingRoomId())) {
- treeCode = sysDepartmentService.getById(query.getDepartmentId()).getTreeCode();
+ 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);
@@ -183,15 +159,9 @@
*/
@Override
public void checkoutRecordExport(CheckoutRecordQuery query, HttpServletResponse response) throws IOException {
- String treeCode = "";
- if (Objects.isNull(query.getDepartmentId()) && Objects.isNull(query.getStagingRoomId())) {
- SysDepartment myDepartment = sysDepartmentService.getMyDepartment();
- if (Objects.isNull(myDepartment)) {
- return;
- }
- treeCode = myDepartment.getTreeCode();
- } else if (Objects.nonNull(query.getDepartmentId()) && Objects.isNull(query.getStagingRoomId())) {
- treeCode = sysDepartmentService.getById(query.getDepartmentId()).getTreeCode();
+ String treeCode = sysDepartmentService.getTreeCodeByDepartmentId(query.getDepartmentId());
+ if (StringUtils.isBlank(treeCode)) {
+ return;
}
List<MwCheckoutRecordVO> list = baseMapper.checkoutRecordList(query, treeCode);
// 这里注意 有同学反应使用swagger 会导致各种问题，请直接用浏览器或者用postman
--
Gitblit v1.7.1