huminmin
2026-06-05 47d31d92a762cda66ff40de2f6cb111a408b146f
不良品审核
已修改3个文件
22 ■■■■ 文件已修改
basic-server/src/main/java/com/ruoyi/basic/controller/QualityDefectiveProductController.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
basic-server/src/main/java/com/ruoyi/basic/dto/DefectiveProductAuditDto.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
basic-server/src/main/java/com/ruoyi/basic/service/impl/QualityDefectiveProductServiceImpl.java 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
basic-server/src/main/java/com/ruoyi/basic/controller/QualityDefectiveProductController.java
@@ -81,10 +81,7 @@
    @ApiOperation(value = "查询不良品审核列表")
    @GetMapping("/audit/page")
    public Result<IPage<QualityDefectiveProduct>> pageDefectiveProductAudit(Page<QualityDefectiveProduct> page, QualityDefectiveProduct query) {
        // 审核列表默认只查询待审核状态
        if (query.getAuditStatus() == null) {
            query.setAuditStatus(0);
        }
        // 审核列表支持按审核状态筛选,不传则查询所有状态
        return Result.success(defectiveProductService.selectPage(page, query));
    }
basic-server/src/main/java/com/ruoyi/basic/dto/DefectiveProductAuditDto.java
@@ -12,9 +12,9 @@
    @ApiModelProperty(value = "主键ID")
    private Long id;
    @ApiModelProperty(value = "审核状态:0-待审核,1-已审核")
    @ApiModelProperty(value = "审核状态:0-待审核,1-审核通过,2-驳回")
    private Integer auditStatus;
    @ApiModelProperty(value = "审核意见")
    private String auditRemark;
}
}
basic-server/src/main/java/com/ruoyi/basic/service/impl/QualityDefectiveProductServiceImpl.java
@@ -1,5 +1,6 @@
package com.ruoyi.basic.service.impl;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -104,13 +105,13 @@
            throw new RuntimeException("不良品信息不存在");
        }
        entity.setAuditStatus(auditDto.getAuditStatus());
        entity.setAuditRemark(auditDto.getAuditRemark());
        entity.setAuditBy(SecurityUtils.getUsername());
        entity.setAuditTime(LocalDateTime.now());
        entity.setUpdateBy(SecurityUtils.getUsername());
        entity.setUpdateTime(LocalDateTime.now());
        String username = SecurityUtils.getUsername();
        LocalDateTime now = LocalDateTime.now();
        entity.setAuditBy(username);
        entity.setAuditRemark(auditDto.getAuditRemark());
        entity.setAuditStatus(auditDto.getAuditStatus());
        entity.setAuditTime(now);
        return defectiveProductMapper.updateById(entity);
    }