Merge remote-tracking branch 'origin/main'

baoshiwei

2025-04-17 bb79260cbeeac88cfbadc9606eea57002e8945bc

 eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsSpareServiceImpl.java

@@ -1,5 +1,6 @@
package org.dromara.eims.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo;
@@ -8,6 +9,10 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.eims.domain.EimsSpareInout;
import org.dromara.eims.domain.bo.EimsSpareInoutBo;
import org.dromara.eims.domain.vo.EimsSpareInoutVo;
import org.dromara.eims.domain.vo.EimsSpareInoutdtVo;
import org.springframework.stereotype.Service;
import org.dromara.eims.domain.bo.EimsSpareBo;
import org.dromara.eims.domain.vo.EimsSpareVo;
@@ -56,6 +61,13 @@
        return TableDataInfo.build(result);
    }


    @Override
    public TableDataInfo<EimsSpareInoutdtVo> querySpareInoutList(EimsSpareBo bo, PageQuery pageQuery) {
        Page<EimsSpareInoutdtVo> result = baseMapper.selectSpareInoutList(pageQuery.build(), buildWrapper(bo));
        return TableDataInfo.build(result);
    }

    /**
     * 查询符合条件的备件台账列表
     *
@@ -79,6 +91,13 @@
        lqw.like(StringUtils.isNotBlank(bo.getSupplier()), EimsSpare::getSupplier, bo.getSupplier());
        lqw.eq(StringUtils.isNotBlank(bo.getUnit()), EimsSpare::getUnit, bo.getUnit());
        return lqw;
    }

    private QueryWrapper<EimsSpare> buildWrapper(EimsSpareBo bo) {
        Map<String, Object> params = bo.getParams();
        QueryWrapper<EimsSpare> qw = Wrappers.query();
        qw.eq( "sp.id", bo.getId());
        return qw;
    }

    /**
@@ -132,4 +151,6 @@
        }
        return baseMapper.deleteByIds(ids) > 0;
    }


}