温度循环+报告英文换行+检验只有一项的设备查询+光纤配置报告换页+温度湿度

zss

2024-07-03 3ae364164cb9d85acce0b53a1ba5c70a80991308

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

@@ -1,6 +1,7 @@
package com.yuanchu.mom.service.impl;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -85,11 +86,22 @@
    public List<Device> selectDeviceByCategory(String inspectionItem, String inspectionItemSubclass) {
        Integer id;
        try {
            id = structureItemParameterMapper.selectOne(Wrappers.<StructureItemParameter>lambdaQuery().eq(StructureItemParameter::getInspectionItem, inspectionItem).eq(StructureItemParameter::getInspectionItemSubclass, inspectionItemSubclass).last("limit 1").select(StructureItemParameter::getId)).getId();
            if (ObjectUtils.isEmpty(inspectionItemSubclass)) {
                id = structureItemParameterMapper.selectOne(Wrappers.<StructureItemParameter>lambdaQuery()
                        .eq(StructureItemParameter::getInspectionItem, inspectionItem)
                        .last("limit 1").select(StructureItemParameter::getId)).getId();
            }else {
                id = structureItemParameterMapper.selectOne(Wrappers.<StructureItemParameter>lambdaQuery()
                        .eq(StructureItemParameter::getInspectionItem, inspectionItem)
                        .eq(StructureItemParameter::getInspectionItemSubclass, inspectionItemSubclass)
                        .last("limit 1").select(StructureItemParameter::getId)).getId();
            }
        } catch (Exception e) {
            return null;
        }
        List<Device> devices = deviceMapper.selectList(Wrappers.<Device>lambdaQuery().eq(Device::getDeviceStatus, 0).isNotNull(Device::getInsProductIds));
        List<Device> devices = deviceMapper.selectList(Wrappers.<Device>lambdaQuery()
                .eq(Device::getDeviceStatus, 0)
                .isNotNull(Device::getInsProductIds));
        List<Device> devices2 = new ArrayList<>();
        for (Device device : devices) {
            String[] ids = device.getInsProductIds().split(",");