From 74205424049d169a8d3bbabb74b4c8c9adf1ec99 Mon Sep 17 00:00:00 2001 From: zhuo <2089219845@qq.com> Date: 星期六, 15 二月 2025 16:05:51 +0800 Subject: [PATCH] 设备列表查询接口修改 --- cnas-server/src/main/java/com/yuanchu/mom/mapper/DeviceMapper.java | 9 +++++++-- 1 files changed, 7 insertions(+), 2 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 8635854..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 @@ -9,6 +9,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; /** * 璁惧(Device)琛ㄦ暟鎹簱璁块棶灞� @@ -31,8 +32,12 @@ //鏌ヨ璁惧璐熻矗浜� List<Device> selectDevicePrincipal(); - IPage<DeviceDto> selectDeviceParameterPage(Page page, @Param("ew") QueryWrapper<DeviceDto> queryWrappers); + IPage<DeviceDto> selectDeviceParameterPage(Page page, @Param("ew") QueryWrapper<DeviceDto> queryWrappers,@Param("laboratoryNameIsNull") Boolean laboratoryNameIsNull); - List<String> getInspectionItemSubclass(@Param("id") Integer id); + 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