fix: 移植长辉已验证的四类接口 500/体验问题（不含物料颜色字段）

xiaoyi

7 天以前 481d8165f26fc7e37f0e87f6444ac0340bb563a3

 yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmProcessExpressionServiceImpl.java

@@ -1,9 +1,16 @@
package cn.iocoder.yudao.module.bpm.service.definition;

import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.exception.ServiceException;
import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.expression.BpmProcessExpressionImportExcelVO;
import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.expression.BpmProcessExpressionImportReqVO;
import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.expression.BpmProcessExpressionImportRespVO;
import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.expression.BpmProcessExpressionPageReqVO;
import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.expression.BpmProcessExpressionSaveReqVO;
import org.springframework.stereotype.Service;
import jakarta.annotation.Resource;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;

import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmProcessExpressionDO;
@@ -12,7 +19,12 @@

import cn.iocoder.yudao.module.bpm.dal.mysql.definition.BpmProcessExpressionMapper;

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;
import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.*;

/**
@@ -69,4 +81,47 @@
        return processExpressionMapper.selectPage(pageReqVO);
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public BpmProcessExpressionImportRespVO importExpressionList(List<BpmProcessExpressionImportExcelVO> importExpressions,
                                                                 BpmProcessExpressionImportReqVO importReqVO) {
        // 1. 校验非空
        importExpressions = filterList(importExpressions, item -> StrUtil.isNotBlank(item.getName()));
        if (CollUtil.isEmpty(importExpressions)) {
            throw exception(PROCESS_EXPRESSION_IMPORT_LIST_IS_EMPTY);
        }
        // 2. 逐条处理
        BpmProcessExpressionImportRespVO respVO = BpmProcessExpressionImportRespVO.builder()
                .createExpressionNames(new ArrayList<>())
                .updateExpressionNames(new ArrayList<>())
                .failureExpressionNames(new LinkedHashMap<>())
                .build();
        importExpressions.forEach(importExpression -> {
            try {
                // 2.1 按名字匹配已存在记录
                BpmProcessExpressionDO existExpression = processExpressionMapper.selectOne(
                        BpmProcessExpressionDO::getName, importExpression.getName());
                if (existExpression == null) {
                    BpmProcessExpressionDO expression = BeanUtils.toBean(importExpression, BpmProcessExpressionDO.class);
                    processExpressionMapper.insert(expression);
                    respVO.getCreateExpressionNames().add(importExpression.getName());
                    return;
                }
                // 2.2 已存在，判断是否允许更新
                if (!importReqVO.getUpdateSupport()) {
                    respVO.getFailureExpressionNames().put(importExpression.getName(),
                            StrUtil.format(PROCESS_EXPRESSION_IMPORT_EXISTS.getMsg(), importExpression.getName()));
                    return;
                }
                BpmProcessExpressionDO updateExpression = BeanUtils.toBean(importExpression, BpmProcessExpressionDO.class)
                        .setId(existExpression.getId());
                processExpressionMapper.updateById(updateExpression);
                respVO.getUpdateExpressionNames().add(importExpression.getName());
            } catch (ServiceException ex) {
                respVO.getFailureExpressionNames().put(importExpression.getName(), ex.getMessage());
            }
        });
        return respVO;
    }

}