From 481d8165f26fc7e37f0e87f6444ac0340bb563a3 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期二, 03 十一月 2026 18:53:22 +0800
Subject: [PATCH] fix: 移植长辉已验证的四类接口 500/体验问题（不含物料颜色字段）
---
yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmFormServiceImpl.java | 63 +++++++++++++++++++++++++++++++
1 files changed, 63 insertions(+), 0 deletions(-)
diff --git a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmFormServiceImpl.java b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmFormServiceImpl.java
index 2a4b9f1..d9b84cb 100644
--- a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmFormServiceImpl.java
+++ b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmFormServiceImpl.java
@@ -2,9 +2,14 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.lang.Assert;
+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.json.JsonUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.form.BpmFormImportExcelVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.form.BpmFormImportReqVO;
+import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.form.BpmFormImportRespVO;
import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.form.BpmFormPageReqVO;
import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.form.BpmFormSaveReqVO;
import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmFormDO;
@@ -13,11 +18,13 @@
import cn.iocoder.yudao.module.bpm.service.definition.dto.BpmFormFieldRespDTO;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import java.util.*;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.filterList;
/**
* 鍔ㄦ�佽〃鍗� Service 瀹炵幇绫�
@@ -111,4 +118,60 @@
}
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public BpmFormImportRespVO importFormList(List<BpmFormImportExcelVO> importForms, BpmFormImportReqVO importReqVO) {
+ // 1. 鏍￠獙闈炵┖
+ importForms = filterList(importForms, item -> StrUtil.isNotBlank(item.getName()));
+ if (CollUtil.isEmpty(importForms)) {
+ throw exception(ErrorCodeConstants.FORM_IMPORT_LIST_IS_EMPTY);
+ }
+ // 2. 閫愭潯澶勭悊
+ BpmFormImportRespVO respVO = BpmFormImportRespVO.builder()
+ .createFormNames(new ArrayList<>())
+ .updateFormNames(new ArrayList<>())
+ .failureFormNames(new LinkedHashMap<>())
+ .build();
+ importForms.forEach(importForm -> {
+ try {
+ // 2.1 鎸夊悕瀛楀尮閰嶅凡瀛樺湪璁板綍
+ BpmFormDO existForm = formMapper.selectOne(BpmFormDO::getName, importForm.getName());
+ if (existForm == null) {
+ BpmFormDO form = BeanUtils.toBean(importForm, BpmFormDO.class);
+ form.setFields(parseFields(importForm.getFieldsJson()));
+ formMapper.insert(form);
+ respVO.getCreateFormNames().add(importForm.getName());
+ return;
+ }
+ // 2.2 宸插瓨鍦紝鍒ゆ柇鏄惁鍏佽鏇存柊
+ if (!importReqVO.getUpdateSupport()) {
+ respVO.getFailureFormNames().put(importForm.getName(),
+ StrUtil.format(ErrorCodeConstants.FORM_IMPORT_EXISTS.getMsg(), importForm.getName()));
+ return;
+ }
+ BpmFormDO updateForm = BeanUtils.toBean(importForm, BpmFormDO.class)
+ .setId(existForm.getId());
+ updateForm.setFields(parseFields(importForm.getFieldsJson()));
+ formMapper.updateById(updateForm);
+ respVO.getUpdateFormNames().add(importForm.getName());
+ } catch (ServiceException ex) {
+ respVO.getFailureFormNames().put(importForm.getName(), ex.getMessage());
+ }
+ });
+ return respVO;
+ }
+
+ /**
+ * 瑙ｆ瀽琛ㄥ崟椤� JSON 鏁扮粍瀛楃涓�
+ *
+ * @param fieldsJson 琛ㄥ崟椤� JSON 鏁扮粍瀛楃涓�
+ * @return 琛ㄥ崟椤规暟缁�
+ */
+ private List<String> parseFields(String fieldsJson) {
+ if (StrUtil.isBlank(fieldsJson)) {
+ return Collections.emptyList();
+ }
+ return JsonUtils.parseArray(fieldsJson, String.class);
+ }
+
}
--
Gitblit v1.9.3