From a382fedba62fa46b3d73c2e988fa6908412a99c9 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 27 三月 2025 14:44:47 +0800
Subject: [PATCH] bug修改
---
medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwMicroEquipmentServiceImpl.java | 100 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 99 insertions(+), 1 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 e5a0a2f..5b8fc7c 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
@@ -1,9 +1,23 @@
package com.sinata.system.service.impl;
+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.BeanUtils;
+import com.sinata.common.utils.StringUtils;
import com.sinata.system.domain.MwMicroEquipment;
+import com.sinata.system.domain.dto.MwMicroEquipmentDTO;
+import com.sinata.system.domain.query.MwMicroEquipmentQuery;
+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.MicroEquipmentStatusEnum;
import com.sinata.system.mapper.MwMicroEquipmentMapper;
import com.sinata.system.service.MwMicroEquipmentService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.sinata.system.service.SysDepartmentService;
+import java.util.List;
+import java.util.Objects;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
/**
@@ -15,6 +29,90 @@
* @since 2024-12-02
*/
@Service
+@RequiredArgsConstructor
public class MwMicroEquipmentServiceImpl extends ServiceImpl<MwMicroEquipmentMapper, MwMicroEquipment> implements MwMicroEquipmentService {
+ private final SysDepartmentService sysDepartmentService;
+ /**
+ * 设备管理分页列表
+ *
+ * @param query
+ * @return
+ */
+ @Override
+ public PageDTO<MwMicroEquipmentVO> pageList(MwMicroEquipmentQuery query) {
+ String treeCode = sysDepartmentService.getTreeCodeByDepartmentId(query.getDepartmentId());
+ if (StringUtils.isBlank(treeCode)) {
+ return PageDTO.empty(0L, 0L);
+ }
+ Page<MwMicroEquipmentVO> page = baseMapper.pageList(new Page<>(query.getPageCurr(), query.getPageSize()), query.getEquipmentName(), query.getStatus(), query.getEquipmentNumber(), treeCode);
+ return PageDTO.of(page);
+ }
+
+ /**
+ * 新增设备
+ *
+ * @param dto
+ * @return
+ */
+ @Override
+ public void add(MwMicroEquipmentDTO dto) {
+ MwMicroEquipment mwMicroEquipment = BeanUtils.copyBean(dto, MwMicroEquipment.class);
+ save(mwMicroEquipment);
+ }
+
+ /**
+ * 编辑设备
+ *
+ * @param dto
+ * @return
+ */
+ @Override
+ public void edit(MwMicroEquipmentDTO dto) {
+ if (Objects.isNull(dto.getId())) {
+ throw new RuntimeException("设备id不能为空");
+ }
+ MwMicroEquipment mwMicroEquipment = BeanUtils.copyBean(dto, MwMicroEquipment.class);
+ updateById(mwMicroEquipment);
+ }
+
+ /**
+ * 待处理的医废列表
+ *
+ * @param query
+ * @return
+ */
+ @Override
+ public PageDTO<MwMedicalWasteBoxVO> storedMedicalWastePage(StorageRecordQuery query) {
+ String treeCode = sysDepartmentService.getTreeCodeByDepartmentId(query.getDepartmentId());
+ if (StringUtils.isBlank(treeCode)) {
+ return PageDTO.empty(0L, 0L);
+ }
+ Page<MwMedicalWasteBoxVO> page = baseMapper.storedMedicalWastePage(new Page<>(query.getPageCurr(), query.getPageSize()), query, treeCode);
+ return PageDTO.of(page);
+ }
+
+ /**
+ * 微型设备列表
+ *
+ * @return
+ */
+ @Override
+ public List<MwMicroEquipmentVO> getList(Long departmentId) {
+// SysDepartment myDepartment = sysDepartmentService.getMyDepartment();
+ List<MwMicroEquipment> list = this.lambdaQuery()
+ .eq(MwMicroEquipment::getStatus, MicroEquipmentStatusEnum.NORMAL.getCode())
+ .eq(MwMicroEquipment::getDepartmentId, departmentId).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())
+ .eq(MwMicroEquipment::getDepartmentId, myDepartment.getId()).list();
+ return BeanUtils.copyList(list, MwMicroEquipmentVO.class);
+ }
+ }
+ return CollUtils.emptyList();*/
+
+ }
}
--
Gitblit v1.7.1