From dddc473c582e983674913163dd4e93f840effbdb Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期一, 26 十月 2026 10:54:55 +0800
Subject: [PATCH] fix(search): 修复多处搜索条件未生效的问题
---
yudao-module-bi/src/main/java/cn/iocoder/yudao/module/bi/service/decision/BiKpiDefinitionServiceImpl.java | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 55 insertions(+), 1 deletions(-)
diff --git a/yudao-module-bi/src/main/java/cn/iocoder/yudao/module/bi/service/decision/BiKpiDefinitionServiceImpl.java b/yudao-module-bi/src/main/java/cn/iocoder/yudao/module/bi/service/decision/BiKpiDefinitionServiceImpl.java
index 95e6db0..7279bee 100644
--- a/yudao-module-bi/src/main/java/cn/iocoder/yudao/module/bi/service/decision/BiKpiDefinitionServiceImpl.java
+++ b/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));
}
-}
\ No newline at end of file
+ @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;
+ }
+
+}
--
Gitblit v1.9.3