From 555a0724a2d62c6fb2faa9bf7abc57cd241880e6 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期一, 19 十月 2026 13:10:16 +0800
Subject: [PATCH] fix(mes): 修复归档台账导出提示系统异常
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/subject/MesDvSubjectServiceImpl.java | 48 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 47 insertions(+), 1 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/subject/MesDvSubjectServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/subject/MesDvSubjectServiceImpl.java
index 60c1839..2357d45 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/subject/MesDvSubjectServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/subject/MesDvSubjectServiceImpl.java
@@ -21,11 +21,18 @@
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
+import cn.iocoder.yudao.module.mes.controller.admin.dv.subject.vo.MesDvSubjectImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.dv.subject.vo.MesDvSubjectImportRespVO;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
+import cn.hutool.core.util.StrUtil;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.concurrent.atomic.AtomicInteger;
/**
* MES 鐐规淇濆吇椤圭洰 Service 瀹炵幇绫�
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Service
@Validated
@@ -128,4 +135,43 @@
return subjectMapper.selectByIds(ids);
}
+
+ @Override
+ public MesDvSubjectImportRespVO importSubjectList(List<MesDvSubjectImportExcelVO> importList, boolean updateSupport) {
+ if (CollUtil.isEmpty(importList)) {
+ throw exception(DV_SUBJECT_IMPORT_LIST_IS_EMPTY);
+ }
+ MesDvSubjectImportRespVO respVO = MesDvSubjectImportRespVO.builder()
+ .createCodes(new ArrayList<>()).updateCodes(new ArrayList<>())
+ .failureCodes(new LinkedHashMap<>()).build();
+ AtomicInteger index = new AtomicInteger(1);
+ importList.forEach(importItem -> {
+ int currentIndex = index.getAndIncrement();
+ String key = StrUtil.blankToDefault(importItem.getCode(), "绗� " + currentIndex + " 琛�");
+ if (StrUtil.isBlank(importItem.getCode())) {
+ respVO.getFailureCodes().put(key, "椤圭洰缂栫爜涓嶈兘涓虹┖");
+ return;
+ }
+ try {
+ MesDvSubjectSaveReqVO saveReqVO = BeanUtils.toBean(importItem, MesDvSubjectSaveReqVO.class);
+ saveReqVO.setType(ObjUtil.defaultIfNull(importItem.getType(), 1));
+ saveReqVO.setStatus(ObjUtil.defaultIfNull(importItem.getStatus(), CommonStatusEnum.ENABLE.getStatus()));
+ MesDvSubjectDO exist = subjectMapper.selectByCode(importItem.getCode());
+ if (exist == null) {
+ createSubject(saveReqVO);
+ respVO.getCreateCodes().add(saveReqVO.getCode());
+ } else if (updateSupport) {
+ saveReqVO.setId(exist.getId());
+ updateSubject(saveReqVO);
+ respVO.getUpdateCodes().add(saveReqVO.getCode());
+ } else {
+ respVO.getFailureCodes().put(key, "椤圭洰缂栫爜宸插瓨鍦細" + importItem.getCode());
+ }
+ } catch (ServiceException e) {
+ respVO.getFailureCodes().put(key, e.getMessage());
+ }
+ });
+ return respVO;
+ }
+
}
--
Gitblit v1.9.3