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-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/project/MesPdProjectController.java | 63 +++++++++++++++++++++++++------
1 files changed, 51 insertions(+), 12 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/project/MesPdProjectController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/project/MesPdProjectController.java
index 45c7cb9..2e5ee7d 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/project/MesPdProjectController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/project/MesPdProjectController.java
@@ -8,6 +8,9 @@
import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
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.pd.project.vo.MesPdProjectAuditReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pd.project.vo.MesPdProjectImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pd.project.vo.MesPdProjectImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.pd.project.vo.MesPdProjectPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.pd.project.vo.MesPdProjectRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.pd.project.vo.MesPdProjectSaveReqVO;
@@ -17,6 +20,7 @@
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
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;
@@ -24,11 +28,14 @@
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.time.LocalDateTime;
import java.util.Collections;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import java.util.stream.Stream;
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
@@ -76,7 +83,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱璁捐椤圭洰")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('mes:pd-project:query')")
public CommonResult<MesPdProjectRespVO> getProject(@RequestParam("id") Long id) {
MesPdProjectDO project = projectService.getProject(id);
if (project == null) {
@@ -87,7 +93,6 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱璁捐椤圭洰鍒嗛〉")
- @PreAuthorize("@ss.hasPermission('mes:pd-project:query')")
public CommonResult<PageResult<MesPdProjectRespVO>> getProjectPage(@Valid MesPdProjectPageReqVO pageReqVO) {
PageResult<MesPdProjectDO> pageResult = projectService.getProjectPage(pageReqVO);
return success(new PageResult<>(buildProjectRespVOList(pageResult.getList()), pageResult.getTotal()));
@@ -104,6 +109,35 @@
// 瀵煎嚭 Excel
ExcelUtils.write(response, "璁捐椤圭洰.xls", "鏁版嵁", MesPdProjectRespVO.class,
buildProjectRespVOList(list));
+ }
+
+ @GetMapping("/get-import-template")
+ @Operation(summary = "鑾峰緱璁捐椤圭洰瀵煎叆妯℃澘")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ // 鎵嬪姩鍒涘缓瀵煎嚭 demo
+ List<MesPdProjectImportExcelVO> list = Collections.singletonList(
+ MesPdProjectImportExcelVO.builder().taskCode("PD-001").taskName("绀轰緥璁捐浠诲姟")
+ .productCode("").productName("").version("V1.0")
+ .chiefDesigner(1L).reviewer(1L)
+ .planFinishTime(LocalDateTime.of(2026, 12, 31, 0, 0))
+ .remark("").build()
+ );
+ // 杈撳嚭
+ ExcelUtils.writeTemplate(response, "璁捐椤圭洰瀵煎叆妯℃澘.xls", "璁捐椤圭洰鍒楄〃", MesPdProjectImportExcelVO.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:pd-project:import')")
+ public CommonResult<MesPdProjectImportRespVO> importExcel(@RequestParam("file") MultipartFile file,
+ @RequestParam(value = "updateSupport", required = false,
+ defaultValue = "false") Boolean updateSupport) throws Exception {
+ List<MesPdProjectImportExcelVO> list = ExcelUtils.read(file, MesPdProjectImportExcelVO.class);
+ return success(projectService.importProjectList(list, updateSupport));
}
@PutMapping("/publish")
@@ -125,21 +159,26 @@
}
@PutMapping("/submit-approval")
- @Operation(summary = "鎻愪氦璁捐椤圭洰瀹℃壒锛堝緟瀹℃牳鈫掑鎵逛腑锛�")
+ @Operation(summary = "鎻愪氦璁捐椤圭洰瀹℃壒锛堝緟瀹℃牳鈫掑鎵逛腑锛夛紝瀹℃牳浜虹敱瀹℃壒閰嶇疆缁熶竴鎸囧畾")
@Parameter(name = "id", description = "缂栧彿", required = true)
- @Parameter(name = "processDefinitionKey", description = "娴佺▼瀹氫箟 Key", required = true)
@PreAuthorize("@ss.hasPermission('mes:pd-project:update')")
- public CommonResult<Boolean> submitProjectApproval(@RequestParam("id") Long id,
- @RequestParam("processDefinitionKey") String processDefinitionKey) {
- projectService.submitProjectApproval(id, processDefinitionKey);
+ public CommonResult<Boolean> submitProjectApproval(@RequestParam("id") Long id) {
+ projectService.submitProjectApproval(id);
return success(true);
}
- @GetMapping("/approve-process-list")
- @Operation(summary = "鑾峰緱璁捐椤圭洰瀹℃壒娴佺▼鍒楄〃")
- @PreAuthorize("@ss.hasPermission('mes:pd-project:update')")
- public CommonResult<List<Map<String, Object>>> getProjectApproveProcessDefinitionList() {
- return success(projectService.getProjectApproveProcessDefinitionList());
+ @PutMapping("/audit")
+ @Operation(summary = "瀹℃牳璁捐椤圭洰锛堝鎵逛腑鈫掑緟褰掓。/寰呭鏍革級锛屼粎瀹℃壒浜烘湰浜哄彲鎿嶄綔")
+ @PreAuthorize("@ss.hasPermission('mes:pd-project:audit')")
+ public CommonResult<Boolean> auditProject(@Valid @RequestBody MesPdProjectAuditReqVO auditReqVO) {
+ projectService.auditProject(auditReqVO.getId(), auditReqVO.getPass(), auditReqVO.getReviewRemark());
+ return success(true);
+ }
+
+ @GetMapping("/approver-ids")
+ @Operation(summary = "鑾峰緱璁捐椤圭洰鐨勫鏍镐汉缂栧彿闆嗗悎锛屼緵鍓嶇鍒ゆ柇鏄惁灞曠ず瀹℃牳鎸夐挳")
+ public CommonResult<Set<Long>> getApproverUserIds() {
+ return success(projectService.getProjectApproverUserIds());
}
@PutMapping("/archive")
--
Gitblit v1.9.3