Merge remote-tracking branch 'origin/dev_ztzb' into dev_ztzb

zhuo

2025-04-22 f206c80520a83a28b3caa91a3fbbd9d039dd8456

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

@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.Result;
import com.ruoyi.framework.exception.ErrorException;
import com.ruoyi.process.dto.QualityMonitorDetailsDto;
import com.ruoyi.process.dto.QualityMonitorDto;
import com.ruoyi.process.mapper.QualityMonitorDetailsEvaluateFileMapper;
import com.ruoyi.process.pojo.*;
@@ -101,7 +102,7 @@
     */
    @ApiOperation(value = "监控计划详情列表")
    @GetMapping("/pageQualityMonitorDetail")
    public Result<IPage<QualityMonitorDetails>> pageQualityMonitorDetail(QualityMonitorDetails qualityMonitorDetails,Page page) throws Exception {
    public Result<IPage<QualityMonitorDetailsDto>> pageQualityMonitorDetail(QualityMonitorDetails qualityMonitorDetails, Page page) throws Exception {
        return Result.success(qualityMonitorService.pageQualityMonitorDetail(page, qualityMonitorDetails));
    }

@@ -236,14 +237,14 @@

    /**
     * 新增监控评价附件表
     * @param detailsEvaluateId
     * @param qualityMonitorDetailsId
     * @param file
     * @return
     */
    @ApiOperation(value = "新增监控评价附件表")
    @PostMapping("/uploadEvaluateFile")
    public Result<?> uploadEvaluateFile(Integer detailsEvaluateId, MultipartFile file) {
        return Result.success(qualityMonitorService.uploadEvaluateFile(detailsEvaluateId, file));
    public Result<?> uploadEvaluateFile(Integer qualityMonitorDetailsId, MultipartFile file) {
        return Result.success(qualityMonitorService.uploadEvaluateFile(qualityMonitorDetailsId, file));
    }


@@ -253,8 +254,8 @@
     */
    @ApiOperation(value = "查询监控评价附件列表")
    @GetMapping("/getEvaluateFileList")
    public Result<List<QualityMonitorDetailsEvaluateFile>> getEvaluateFileList(Integer detailsEvaluateId) {
        return Result.success(qualityMonitorService.getEvaluateFileList(detailsEvaluateId));
    public Result<List<QualityMonitorDetailsEvaluateFile>> getEvaluateFileList(Integer qualityMonitorDetailsId) {
        return Result.success(qualityMonitorService.getEvaluateFileList(qualityMonitorDetailsId));
    }

    /**
@@ -262,7 +263,7 @@
     * @return
     */
    @ApiOperation(value = "删除监控评价附件表")
    @GetMapping("/delVerifyEvaluateFileList")
    @DeleteMapping("/delVerifyEvaluateFileList")
    public Result delVerifyMethodFileList(Integer evaluateFileId) {
        return Result.success(qualityMonitorDetailsEvaluateFileMapper.deleteById(evaluateFileId));
    }