车间能级提升-智能设备管理系统
baoshiwei
2025-07-02 2f0009c750de4d47a18cce4a5a403fa83ba0c209
eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsEquServiceImpl.java
@@ -53,8 +53,9 @@
    @Override
    public EimsEquVo queryByAssetNo(String assetNo) {
        LambdaQueryWrapper<EimsEqu> lqw = new LambdaQueryWrapper<>();
        lqw.eq(EimsEqu::getAssetNo, assetNo);
        return baseMapper.selectVoOne(lqw);
        lqw.eq(EimsEqu::getAssetNo, assetNo.trim());
        EimsEquVo eimsEquVo = baseMapper.selectVoOne(lqw);
        return eimsEquVo;
    }
    /**
@@ -96,6 +97,14 @@
            List<Long> allDescendantIds = getAllDescendantIds(equTypeId);
            lqw.in(EimsEqu::getEquTypeId, allDescendantIds);
        }
        if (params.get("searchValue") != null && StringUtils.isNotBlank(params.get("searchValue").toString())) {
            // 如果搜索值不为空,则按设备名称、资产编号进行模糊查询
            lqw.and(wrapper -> {
                wrapper.like(EimsEqu::getEquName, params.get("searchValue"))
                    .or()
                    .like(EimsEqu::getAssetNo, params.get("searchValue"));
            });
        }
        lqw.like(StringUtils.isNotBlank(bo.getEquName()), EimsEqu::getEquName, bo.getEquName());
        lqw.eq(StringUtils.isNotBlank(bo.getModelNo()), EimsEqu::getModelNo, bo.getModelNo());
@@ -119,6 +128,8 @@
        lqw.eq(bo.getServiceLife() != null, EimsEqu::getServiceLife, bo.getServiceLife());
        lqw.between(params.get("beginTime") != null && params.get("endTime") != null,
            EimsEqu::getDeployDate, params.get("beginTime"), params.get("endTime"));
        // 按创建日期倒序
        lqw.orderByDesc(EimsEqu::getCreateTime);
        return lqw;
    }