Merge branch 'dev' into dev_zj

zss

2025-03-06 fd7bc95a3c91fb7d90a921b0ff762fa6095fabd1

 cnas-process/src/main/java/com/ruoyi/process/controller/ProcessOrderController.java

@@ -9,6 +9,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
@@ -36,6 +37,17 @@
        return Result.success(processOrderService.pageProcessOrder(page, processOrderDto));
    }

    /**
     * 上传文件
     * @param file
     * @return
     */
    @PostMapping("/uploadFile")
    public Result uploadFile(@RequestParam("file") MultipartFile file, @RequestParam("id") Integer id) {
        processOrderService.uploadFile(file,id);
        return Result.success();
    }

    @ApiOperation(value = "删除要求、标书和合同评审")
    @DeleteMapping("/delProcessOrder")
    public Result delProcessOrder(Long id) {