Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-09-04 6db5272e2df8a27942f10c03d93183fc9b01e22a

 base-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java

@@ -40,19 +40,6 @@
        return deviceMapper.selectTreeDevice(type, father, deviceStatus, message);
    }

    //查询所有设备
    @Override
    public List<Device> selectDevice() {
        return deviceMapper.selectList(new QueryWrapper<>());
    }

    //根据设备id获取设备名称
    @Override
    public String getDeviceNameById(Integer id) {
        Device device = deviceMapper.selectById(id);
        return device.getName();
    }

    //新增仪器设备
    @Override
    public Integer addDevice(DeviceDto deviceDto) {
@@ -90,4 +77,10 @@
    public void delAllDevice(String ids) {
        deviceMapper.delAllDevice(ids);
    }

    //原材料检验-->选择设备
    @Override
    public List<Map<String, Object>> chooseDevice() {
        return deviceMapper.chooseDevice();
    }
}