From 6d04ababede9c34da15c6b7463b97b361e4d9990 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 31 十二月 2024 21:20:16 +0800
Subject: [PATCH] 1.bug修改 2.警定时任务
---
medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwMicroEquipmentServiceImpl.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwMicroEquipmentServiceImpl.java b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwMicroEquipmentServiceImpl.java
index d9f095d..c0fe593 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwMicroEquipmentServiceImpl.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwMicroEquipmentServiceImpl.java
@@ -3,9 +3,7 @@
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.CollUtils;
import com.sinata.common.utils.StringUtils;
import com.sinata.system.domain.MwMicroEquipment;
import com.sinata.system.domain.SysDepartment;
@@ -14,7 +12,6 @@
import com.sinata.system.domain.query.StorageRecordQuery;
import com.sinata.system.domain.vo.MwMedicalWasteBoxVO;
import com.sinata.system.domain.vo.MwMicroEquipmentVO;
-import com.sinata.system.enums.DepartmentEnum;
import com.sinata.system.enums.MicroEquipmentStatusEnum;
import com.sinata.system.mapper.MwMicroEquipmentMapper;
import com.sinata.system.service.MwMicroEquipmentService;
@@ -105,7 +102,11 @@
@Override
public List<MwMicroEquipmentVO> getList() {
SysDepartment myDepartment = sysDepartmentService.getMyDepartment();
- if (Objects.nonNull(myDepartment)) {
+ //TODO 待完善
+ List<MwMicroEquipment> list = this.lambdaQuery()
+ .eq(MwMicroEquipment::getStatus, MicroEquipmentStatusEnum.NORMAL.getCode()).list();
+ return BeanUtils.copyList(list, MwMicroEquipmentVO.class);
+ /*if (Objects.nonNull(myDepartment)) {
if (myDepartment.getOrgType().equals(DepartmentEnum.MEDICAL_INSTITUTION.getCode())) {
List<MwMicroEquipment> list = this.lambdaQuery()
.eq(MwMicroEquipment::getStatus, MicroEquipmentStatusEnum.NORMAL.getCode())
@@ -113,6 +114,7 @@
return BeanUtils.copyList(list, MwMicroEquipmentVO.class);
}
}
- return CollUtils.emptyList();
+ return CollUtils.emptyList();*/
+
}
}
--
Gitblit v1.7.1