diff --git a/ruoyi-admin/src/main/java/com/ruoyi/quality/domain/QualityOrderReportUnqualified.java b/ruoyi-admin/src/main/java/com/ruoyi/quality/domain/QualityOrderReportUnqualified.java index bb429d18..f3633169 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/quality/domain/QualityOrderReportUnqualified.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/quality/domain/QualityOrderReportUnqualified.java @@ -55,8 +55,8 @@ public class QualityOrderReportUnqualified extends BaseEntity @Excel(name = "不良数量") private Integer processBadNum; - /** 不合格报告url */ - @Excel(name = "不合格报告url") + /** 不良描述 */ + @Excel(name = "不良描述") private String unqualifiedReportUrl; public void setOrderReportUnqualifiedId(Long orderReportUnqualifiedId) diff --git a/ruoyi-admin/src/main/resources/mapper/quality/QualityOrderReportMapper.xml b/ruoyi-admin/src/main/resources/mapper/quality/QualityOrderReportMapper.xml index 5c274afe..1ce32316 100644 --- a/ruoyi-admin/src/main/resources/mapper/quality/QualityOrderReportMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/quality/QualityOrderReportMapper.xml @@ -74,7 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and audit_status = #{auditStatus} and apply_user = #{applyUser} - order by create_time desc,audit_status asc + order by audit_status asc, create_time desc