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-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/ErpAccountController.java | 29 ++++++++++++++++++++++++++---
1 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/ErpAccountController.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/ErpAccountController.java
index 5c68ed9..622af9b 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/ErpAccountController.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/ErpAccountController.java
@@ -7,6 +7,9 @@
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+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.ErpAccountRespVO;
import cn.iocoder.yudao.module.erp.controller.admin.finance.vo.account.ErpAccountSaveReqVO;
@@ -24,6 +27,7 @@
import org.springframework.web.bind.annotation.*;
import java.io.IOException;
+import java.util.Arrays;
import java.util.List;
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
@@ -78,7 +82,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱缁撶畻璐︽埛")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('erp:account:query')")
public CommonResult<ErpAccountRespVO> getAccount(@RequestParam("id") Long id) {
ErpAccountDO account = accountService.getAccount(id);
return success(BeanUtils.toBean(account, ErpAccountRespVO.class));
@@ -94,7 +97,6 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱缁撶畻璐︽埛鍒嗛〉")
- @PreAuthorize("@ss.hasPermission('erp:account:query')")
public CommonResult<PageResult<ErpAccountRespVO>> getAccountPage(@Valid ErpAccountPageReqVO pageReqVO) {
PageResult<ErpAccountDO> pageResult = accountService.getAccountPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, ErpAccountRespVO.class));
@@ -113,4 +115,25 @@
BeanUtils.toBean(list, ErpAccountRespVO.class));
}
-}
\ No newline at end of file
+ @GetMapping("/get-import-template")
+ @Operation(summary = "鑾峰緱瀵煎叆缁撶畻璐︽埛妯℃澘")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ // 鎵嬪姩鍒涘缓瀵煎嚭 demo
+ List<ErpAccountImportExcelVO> list = Arrays.asList(
+ ErpAccountImportExcelVO.builder().name("绀轰緥璐︽埛").no("A88").remark("")
+ .status(CommonStatusEnum.ENABLE.getStatus()).sort(0).build()
+ );
+ // 杈撳嚭
+ ExcelUtils.write(response, "缁撶畻璐︽埛瀵煎叆妯℃澘.xls", "缁撶畻璐︽埛鍒楄〃", ErpAccountImportExcelVO.class, list);
+ }
+
+ @PostMapping("/import")
+ @Operation(summary = "瀵煎叆缁撶畻璐︽埛")
+ @PreAuthorize("@ss.hasPermission('erp:account:import')")
+ public CommonResult<ErpAccountImportRespVO> importExcel(@Valid ErpAccountImportReqVO importReqVO)
+ throws Exception {
+ List<ErpAccountImportExcelVO> list = ExcelUtils.read(importReqVO.getFile(), ErpAccountImportExcelVO.class);
+ return success(accountService.importAccountList(list, importReqVO));
+ }
+
+}
--
Gitblit v1.9.3