From 5f612ab2f67b2c6f6894c624a7780799526d566d Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期四, 05 十一月 2026 20:20:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business_新高电力' into dev_business_新高电力
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/outsourcetest/MesQcOutsourceTestController.java | 39 +++++++++++++++++++++++++++++++++++++--
1 files changed, 37 insertions(+), 2 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/outsourcetest/MesQcOutsourceTestController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/outsourcetest/MesQcOutsourceTestController.java
index ba1f42f..98fcd85 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/outsourcetest/MesQcOutsourceTestController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/outsourcetest/MesQcOutsourceTestController.java
@@ -1,4 +1,7 @@
package cn.iocoder.yudao.module.mes.controller.admin.qc.outsourcetest;
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import jakarta.servlet.http.HttpServletResponse;
+import java.io.IOException;
import cn.hutool.core.collection.CollUtil;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
@@ -28,6 +31,10 @@
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
+import org.springframework.web.multipart.MultipartFile;
+import io.swagger.v3.oas.annotations.Parameters;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.outsourcetest.vo.MesQcOutsourceTestImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.outsourcetest.vo.MesQcOutsourceTestImportRespVO;
@Tag(name = "绠＄悊鍚庡彴 - MES 濮斿妫�娴�/璇曢獙鍗�")
@RestController
@@ -69,7 +76,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱濮斿妫�娴�/璇曢獙鍗�")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('mes:qc-outsource-test:query')")
public CommonResult<MesQcOutsourceTestRespVO> getTest(@RequestParam("id") Long id) {
MesQcOutsourceTestDO test = testService.getTest(id);
if (test == null) {
@@ -80,7 +86,6 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱濮斿妫�娴�/璇曢獙鍗曞垎椤�")
- @PreAuthorize("@ss.hasPermission('mes:qc-outsource-test:query')")
public CommonResult<PageResult<MesQcOutsourceTestRespVO>> getTestPage(@Valid MesQcOutsourceTestPageReqVO pageReqVO) {
PageResult<MesQcOutsourceTestDO> pageResult = testService.getTestPage(pageReqVO);
if (CollUtil.isEmpty(pageResult.getList())) {
@@ -125,4 +130,34 @@
MapUtils.findAndThen(itemMap, itemId, item -> vo.setItemName(item.getName()));
}
+
+ @GetMapping("/get-import-template")
+ @Operation(summary = "鑾峰緱濮斿妫�娴�/璇曢獙鍗曞鍏ユā鏉�")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ // 鎵嬪姩鍒涘缓瀵煎嚭 demo
+ List<MesQcOutsourceTestImportExcelVO> list = Collections.singletonList(
+ MesQcOutsourceTestImportExcelVO.builder()
+ .name("濮斿妫�娴嬪崟").testType(1).itemCode("M-001").testOrg("")
+ .testDate(java.time.LocalDateTime.of(2026, 12, 31, 8, 0))
+ .result(1).reportNo("").remark("")
+ .build()
+ );
+ // 杈撳嚭
+ ExcelUtils.writeTemplate(response, "濮斿妫�娴嬭瘯楠屽崟瀵煎叆妯℃澘.xls", "濮斿妫�娴嬭瘯楠屽崟鍒楄〃", MesQcOutsourceTestImportExcelVO.class, list);
+ }
+
+ @PostMapping("/import")
+ @Operation(summary = "瀵煎叆濮斿妫�娴�/璇曢獙鍗�")
+ @Parameters({
+ @Parameter(name = "file", description = "Excel 鏂囦欢", required = true),
+ @Parameter(name = "updateSupport", description = "鏄惁鏀寔鏇存柊锛岄粯璁や负 false", example = "true")
+ })
+ @PreAuthorize("@ss.hasPermission('mes:qc-outsource-test:import')")
+ public CommonResult<MesQcOutsourceTestImportRespVO> importExcel(@RequestParam("file") MultipartFile file,
+ @RequestParam(value = "updateSupport", required = false,
+ defaultValue = "false") Boolean updateSupport) throws Exception {
+ List<MesQcOutsourceTestImportExcelVO> list = ExcelUtils.read(file, MesQcOutsourceTestImportExcelVO.class);
+ return success(testService.importTestList(list, updateSupport));
+ }
+
}
--
Gitblit v1.9.3