From ac2e2b5af3726ee64dc37c3ebf26989a0346f22a Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期六, 07 十一月 2026 19:16:05 +0800
Subject: [PATCH] feat(feedback): 优化报工审批流程并增加报工人校验
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscissue/MesWmMiscIssueController.java | 35 ++++++++++++++++++++++++++++++++---
1 files changed, 32 insertions(+), 3 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscissue/MesWmMiscIssueController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscissue/MesWmMiscIssueController.java
index 3c8e1b0..068852a 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscissue/MesWmMiscIssueController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/miscissue/MesWmMiscIssueController.java
@@ -8,6 +8,8 @@
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.module.mes.controller.admin.wm.miscissue.vo.MesWmMiscIssueAuditReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.miscissue.vo.MesWmMiscIssueImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.miscissue.vo.MesWmMiscIssueImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.miscissue.vo.MesWmMiscIssuePageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.miscissue.vo.MesWmMiscIssueRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.miscissue.vo.MesWmMiscIssueSaveReqVO;
@@ -15,6 +17,7 @@
import cn.iocoder.yudao.module.mes.service.wm.miscissue.MesWmMiscIssueService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse;
@@ -22,6 +25,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
import java.util.Collections;
@@ -67,7 +71,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱鏉傞」鍑哄簱鍗�")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('mes:wm-misc-issue:query')")
public CommonResult<MesWmMiscIssueRespVO> getMiscIssue(@RequestParam("id") Long id) {
MesWmMiscIssueDO issue = miscIssueService.getMiscIssue(id);
if (issue == null) {
@@ -78,7 +81,6 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱鏉傞」鍑哄簱鍗曞垎椤�")
- @PreAuthorize("@ss.hasPermission('mes:wm-misc-issue:query')")
public CommonResult<PageResult<MesWmMiscIssueRespVO>> getMiscIssuePage(
@Valid MesWmMiscIssuePageReqVO pageReqVO) {
PageResult<MesWmMiscIssueDO> pageResult = miscIssueService.getMiscIssuePage(pageReqVO);
@@ -116,7 +118,6 @@
@GetMapping("/approver-ids")
@Operation(summary = "鑾峰緱鏉傞」鍑哄簱鍗曠殑瀹℃牳浜虹紪鍙烽泦鍚堬紝渚涘墠绔垽鏂槸鍚﹀睍绀哄鏍告寜閽�")
- @PreAuthorize("@ss.hasPermission('mes:wm-misc-issue:query')")
public CommonResult<Set<Long>> getApproverUserIds() {
return success(miscIssueService.getMiscIssueApproverUserIds());
}
@@ -139,6 +140,34 @@
return success(true);
}
+ @GetMapping("/get-import-template")
+ @Operation(summary = "鑾峰緱鏉傞」鍑哄簱鍗曞鍏ユā鏉�")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ // 鎵嬪姩鍒涘缓瀵煎嚭 demo
+ List<MesWmMiscIssueImportExcelVO> list = Collections.singletonList(
+ MesWmMiscIssueImportExcelVO.builder()
+ .code("MI20260302001").name("绀轰緥鏉傞」鍑哄簱鍗�").type(1)
+ .issueDate(java.time.LocalDateTime.of(2026, 3, 2, 8, 0))
+ .sourceDocType("").sourceDocCode("").remark("").build()
+ );
+ // 杈撳嚭
+ ExcelUtils.writeTemplate(response, "鏉傞」鍑哄簱鍗曞鍏ユā鏉�.xls", "鏉傞」鍑哄簱鍗曞垪琛�", MesWmMiscIssueImportExcelVO.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:wm-misc-issue:import')")
+ public CommonResult<MesWmMiscIssueImportRespVO> importExcel(@RequestParam("file") MultipartFile file,
+ @RequestParam(value = "updateSupport", required = false,
+ defaultValue = "false") Boolean updateSupport) throws Exception {
+ List<MesWmMiscIssueImportExcelVO> list = ExcelUtils.read(file, MesWmMiscIssueImportExcelVO.class);
+ return success(miscIssueService.importMiscIssueList(list, updateSupport));
+ }
+
// ==================== 鎷兼帴 VO ====================
private List<MesWmMiscIssueRespVO> buildRespVOList(List<MesWmMiscIssueDO> list) {
--
Gitblit v1.9.3