From 6d1bf32bc0b51dc12048fe6bb70badfbd31d67ac Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期六, 07 十一月 2026 13:44:10 +0800
Subject: [PATCH] fix: 修复销售订单审批及开票回款搜索
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpAccountServiceImpl.java | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 51 insertions(+), 1 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpAccountServiceImpl.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpAccountServiceImpl.java
index 4a056ce..025618c 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpAccountServiceImpl.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpAccountServiceImpl.java
@@ -1,8 +1,14 @@
package cn.iocoder.yudao.module.erp.service.finance;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
+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.module.erp.controller.admin.finance.vo.account.ErpAccountImportExcelVO;
+import cn.iocoder.yudao.module.erp.controller.admin.finance.vo.account.ErpAccountImportReqVO;
+import cn.iocoder.yudao.module.erp.controller.admin.finance.vo.account.ErpAccountImportRespVO;
import cn.iocoder.yudao.module.erp.controller.admin.finance.vo.account.ErpAccountPageReqVO;
import cn.iocoder.yudao.module.erp.controller.admin.finance.vo.account.ErpAccountSaveReqVO;
import cn.iocoder.yudao.module.erp.dal.dataobject.finance.ErpAccountDO;
@@ -11,16 +17,19 @@
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
+import java.util.ArrayList;
import java.util.Collection;
+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.erp.enums.ErrorCodeConstants.*;
/**
* ERP 缁撶畻璐︽埛 Service 瀹炵幇绫�
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Service
@Validated
@@ -109,4 +118,45 @@
return accountMapper.selectPage(pageReqVO);
}
+ @Override
+ public ErpAccountImportRespVO importAccountList(List<ErpAccountImportExcelVO> importAccounts,
+ ErpAccountImportReqVO importReqVO) {
+ // 1. 鏍￠獙闈炵┖
+ importAccounts = filterList(importAccounts, item -> StrUtil.isNotBlank(item.getName()));
+ if (CollUtil.isEmpty(importAccounts)) {
+ throw exception(ACCOUNT_IMPORT_LIST_IS_EMPTY);
+ }
+ // 2. 閫愭潯澶勭悊
+ ErpAccountImportRespVO respVO = ErpAccountImportRespVO.builder()
+ .createAccountNames(new ArrayList<>())
+ .updateAccountNames(new ArrayList<>())
+ .failureAccountNames(new LinkedHashMap<>())
+ .build();
+ importAccounts.forEach(importAccount -> {
+ try {
+ ErpAccountDO existAccount = accountMapper.selectByName(importAccount.getName());
+ if (existAccount == null) {
+ // 鏂板
+ ErpAccountDO account = BeanUtils.toBean(importAccount, ErpAccountDO.class);
+ accountMapper.insert(account);
+ respVO.getCreateAccountNames().add(importAccount.getName());
+ return;
+ }
+ // 宸插瓨鍦紝鍒ゆ柇鏄惁鍏佽鏇存柊
+ if (!importReqVO.getUpdateSupport()) {
+ respVO.getFailureAccountNames().put(importAccount.getName(),
+ StrUtil.format(ACCOUNT_NAME_EXISTS.getMsg(), importAccount.getName()));
+ return;
+ }
+ ErpAccountDO updateAccount = BeanUtils.toBean(importAccount, ErpAccountDO.class)
+ .setId(existAccount.getId());
+ accountMapper.updateById(updateAccount);
+ respVO.getUpdateAccountNames().add(importAccount.getName());
+ } catch (ServiceException ex) {
+ respVO.getFailureAccountNames().put(importAccount.getName(), ex.getMessage());
+ }
+ });
+ return respVO;
+ }
+
}
--
Gitblit v1.9.3