feat(system): 优化用户搜索功能并完善ERP和MES模块验证逻辑

云

2026-10-25 d54fbc9d4f8981fa0f7f613b33a28a8cd4f764ea

 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;
@@ -106,6 +113,35 @@
                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.write(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")
    @Operation(summary = "发布设计项目（待发布→待上传）")
    @Parameter(name = "id", description = "编号", required = true)
@@ -125,21 +161,27 @@
    }

    @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 = "获得设计项目的审核人编号集合，供前端判断是否展示审核按钮")
    @PreAuthorize("@ss.hasPermission('mes:pd-project:query')")
    public CommonResult<Set<Long>> getApproverUserIds() {
        return success(projectService.getProjectApproverUserIds());
    }

    @PutMapping("/archive")