联调基础信息

liding

3 天以前 a461d5fc184fd0129a0eb5a5b3e34f67d75cc6a2

 basic-server/src/main/java/com/ruoyi/basic/service/impl/SupplyServiceImpl.java

@@ -14,6 +14,7 @@
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;

import java.util.List;
import java.util.Objects;

/**
@@ -33,17 +34,29 @@
    @Override
    public IPage<Supply> selectSupplyList(Page page, SupplyDto supplyDto) {
        LambdaQueryWrapper<Supply> queryWrapper = new LambdaQueryWrapper<>();

        // 供应商名称模糊查询
        if (StringUtils.hasText(supplyDto.getSupplierName())) {
            queryWrapper.like(Supply::getSupplierName, supplyDto.getSupplierName());
        // 全局模糊搜索字段
        if (StringUtils.hasText(supplyDto.getSearchAll())) {
            String keyword = supplyDto.getSearchAll();
            queryWrapper.and(wrapper -> wrapper
                    .like(Supply::getSupplierName, keyword)
                    .or()
                    .like(Supply::getTaxpayerId, keyword)
                    .or()
                    .like(Supply::getBusinessAddress, keyword)
            );
        } else {
            // 单独条件查询
            if (StringUtils.hasText(supplyDto.getSupplierName())) {
                queryWrapper.like(Supply::getSupplierName, supplyDto.getSupplierName());
            }
            if (StringUtils.hasText(supplyDto.getTaxpayerId())) {
                queryWrapper.like(Supply::getTaxpayerId, supplyDto.getTaxpayerId());
            }
            if (StringUtils.hasText(supplyDto.getBusinessAddress())) {
                queryWrapper.like(Supply::getBusinessAddress, supplyDto.getBusinessAddress());
            }
        }

        // 纳税人识别号精确查询
        if (StringUtils.hasText(supplyDto.getTaxpayerId())) {
            queryWrapper.eq(Supply::getTaxpayerId, supplyDto.getTaxpayerId());
        }

        // 默认按创建时间倒序排列
        queryWrapper.orderByDesc(Supply::getCreateTime);
        return supplyMapper.selectPage(page, queryWrapper);
    }
@@ -65,13 +78,16 @@
        if (ids == null || ids.length == 0) {
            return 0;
        }

        // 构造更新条件
        UpdateWrapper<Supply> updateWrapper = new UpdateWrapper<>();
        updateWrapper.in("id", ids)
                .set("deleted", 1);  // 设置 deleted 为 1 表示已删除

        // 执行批量逻辑删除
        return supplyMapper.update(null, updateWrapper);
    }

    @Override
    public List<Supply> supplyList() {
        return supplyMapper.selectList(null);
    }
}