From 85766196b2b6588e8dec502366b3c5619133004c Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期一, 24 三月 2025 17:35:13 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/tx-lims-after
---
cnas-server/src/main/java/com/yuanchu/mom/mapper/DeviceMapper.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/mapper/DeviceMapper.java b/cnas-server/src/main/java/com/yuanchu/mom/mapper/DeviceMapper.java
index a07992d..f7e0f7d 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/mapper/DeviceMapper.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/mapper/DeviceMapper.java
@@ -4,10 +4,12 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.dto.DeviceDto;
import com.yuanchu.mom.pojo.Device;
-import org.springframework.data.repository.query.Param;
+import org.apache.ibatis.annotations.Param;
import java.util.List;
+import java.util.Map;
/**
* 璁惧(Device)琛ㄦ暟鎹簱璁块棶灞�
@@ -16,9 +18,6 @@
IPage<Device> selectDeviceParameter(Page page, QueryWrapper<Device> ew);
List<Device> selectEquipmentOverview(Page page, QueryWrapper<Device> ew);
-
- //鏇存柊
- int upDeviceParameter(Device itemParameter);
//鑾峰彇琚巿鏉冧汉
List<Device> authorizedPerson();
@@ -33,5 +32,12 @@
//鏌ヨ璁惧璐熻矗浜�
List<Device> selectDevicePrincipal();
+ IPage<DeviceDto> selectDeviceParameterPage(Page page, @Param("ew") QueryWrapper<DeviceDto> queryWrappers,@Param("laboratoryNameIsNull") Boolean laboratoryNameIsNull);
+
+ List<Map<String, Object>> getInspectionItemSubclass(@Param("id") Integer id);
+
+ List<Map<String, Object>> treeDevice(@Param("deviceName") String deviceName);
+
+ DeviceDto selectDeviceByCode(Integer id);
}
--
Gitblit v1.9.3