Merge branch 'dev_cr' into dev

zhuo

2025-03-10 ac9ba01f811d9755204a82bd7bd9a444139711fd

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

@@ -7,10 +7,7 @@
import com.ruoyi.process.service.ProcessReportService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.Map;
@@ -32,7 +29,7 @@
    private ProcessReportService processReportService;

    @ApiOperation(value = "查询检验报告发放登记列表")
    @PostMapping("/pageProcessReport")
    @GetMapping("/pageProcessReport")
    public Result pageProcessReport(ProcessReport processReport , Page page) throws Exception {
        return Result.success(processReportService.pageProcessReport(page, processReport));
    }
@@ -44,13 +41,13 @@
    }

    @ApiOperation(value = "删除检验报告发放登记")
    @PostMapping("/delProcessReport")
    @DeleteMapping("/delProcessReport")
    public Result delProcessReport(Long id) {
        return Result.success(processReportService.removeById(id));
    }

    @ApiOperation(value = "查看检验报告发放登记详情")
    @PostMapping("/getProcessReport")
    @GetMapping("/getProcessReport")
    public Result getProcessReport(Long id)  {
        return Result.success(processReportService.getById(id));
    }
@@ -62,8 +59,8 @@
    }

    @ApiOperation(value = "导出检验报告发放登记表")
    @PostMapping("/exportProcessReport")
    public Result exportProcessReport(@RequestBody ProcessReportDto processReportDto) {
    @GetMapping("/exportProcessReport")
    public Result exportProcessReport(ProcessReportDto processReportDto) {
        return Result.success(processReportService.exportProcessReport(processReportDto.getIds()));
    }