fix(search): 修复多处搜索条件未生效的问题

liu

2026-10-26 dddc473c582e983674913163dd4e93f840effbdb

 yudao-module-bi/src/main/java/cn/iocoder/yudao/module/bi/service/decision/BiKpiDefinitionServiceImpl.java

@@ -1,7 +1,14 @@
package cn.iocoder.yudao.module.bi.service.decision;

import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.exception.ServiceException;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.bi.controller.admin.decision.vo.DecisionKpiDefinitionImportExcelVO;
import cn.iocoder.yudao.module.bi.controller.admin.decision.vo.DecisionKpiDefinitionImportReqVO;
import cn.iocoder.yudao.module.bi.controller.admin.decision.vo.DecisionKpiDefinitionImportRespVO;
import cn.iocoder.yudao.module.bi.controller.admin.decision.vo.DecisionKpiDefinitionPageReqVO;
import cn.iocoder.yudao.module.bi.dal.dataobject.decision.BiKpiDefinitionDO;
import cn.iocoder.yudao.module.bi.dal.mysql.decision.BiKpiDefinitionMapper;
@@ -10,7 +17,12 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;

import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.filterList;

/**
 * KPI指标定义 Service 实现
@@ -78,4 +90,46 @@
                .orderByAsc(BiKpiDefinitionDO::getSort));
    }

}
    @Override
    @Transactional(rollbackFor = Exception.class)
    public DecisionKpiDefinitionImportRespVO importKpiDefinitionList(List<DecisionKpiDefinitionImportExcelVO> importList,
                                                                     DecisionKpiDefinitionImportReqVO importReqVO) {
        // 1. 校验非空
        importList = filterList(importList, item -> StrUtil.isNotBlank(item.getCode()));
        if (CollUtil.isEmpty(importList)) {
            throw exception(ErrorCodeConstants.KPI_IMPORT_LIST_IS_EMPTY);
        }
        // 2. 逐条处理
        DecisionKpiDefinitionImportRespVO respVO = DecisionKpiDefinitionImportRespVO.builder()
                .createKpiCodes(new ArrayList<>())
                .updateKpiCodes(new ArrayList<>())
                .failureKpiCodes(new LinkedHashMap<>())
                .build();
        importList.forEach(item -> {
            try {
                BiKpiDefinitionDO exist = kpiMapper.selectOne(BiKpiDefinitionDO::getCode, item.getCode());
                if (exist == null) {
                    // 2.1 新增
                    BiKpiDefinitionDO kpi = BeanUtils.toBean(item, BiKpiDefinitionDO.class);
                    kpiMapper.insert(kpi);
                    respVO.getCreateKpiCodes().add(item.getCode());
                    return;
                }
                // 2.2 已存在，判断是否允许更新
                if (!importReqVO.getUpdateSupport()) {
                    respVO.getFailureKpiCodes().put(item.getCode(),
                            StrUtil.format(ErrorCodeConstants.KPI_CODE_EXISTS.getMsg(), item.getCode()));
                    return;
                }
                BiKpiDefinitionDO updateObj = BeanUtils.toBean(item, BiKpiDefinitionDO.class)
                        .setId(exist.getId());
                kpiMapper.updateById(updateObj);
                respVO.getUpdateKpiCodes().add(item.getCode());
            } catch (ServiceException ex) {
                respVO.getFailureKpiCodes().put(item.getCode(), ex.getMessage());
            }
        });
        return respVO;
    }

}