From 370ef8235b123d89a67e0017f7232f98c624c3dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com>
Date: Tue, 14 Jan 2025 17:44:38 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=20=E5=93=81=E8=B4=A8=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E5=93=81=E8=B4=A8=E6=8A=A5=E5=91=8A=E5=8D=95=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=93=81=E8=B4=A8=E6=8A=A5=E5=91=8A=E5=8D=95=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2mapper=E6=96=B9=E6=B3=95=EF=BC=8C?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A0=B9=E6=8D=AE=E5=AE=A1=E6=89=B9=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=8E=92=E5=BA=8F=E8=AF=AD=E5=8F=A5=EF=BC=9B=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=93=81=E8=B4=A8=E6=8A=A5=E5=91=8A=E5=8D=95?=
 =?UTF-8?q?=E4=B8=8D=E5=90=88=E6=A0=BC=E5=88=86=E7=B1=BB=E5=AE=9E=E4=BD=93?=
 =?UTF-8?q?=E7=B1=BB=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=8A=A5=E5=91=8A=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E5=AD=97=E6=AE=B5=E4=B8=BA=E4=B8=8D=E8=89=AF=E6=8F=8F?=
 =?UTF-8?q?=E8=BF=B0=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/quality/domain/QualityOrderReportUnqualified.java   | 4 ++--
 .../resources/mapper/quality/QualityOrderReportMapper.xml     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

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"
             <if test="auditStatus != null and auditStatus != ''"> and audit_status = #{auditStatus}</if>
             <if test="applyUser != null and applyUser != ''"> and apply_user = #{applyUser}</if>
         </where>
-        order by create_time desc,audit_status asc
+        order by audit_status asc, create_time desc
     </select>
     
     <select id="selectQualityOrderReportById" parameterType="Long" resultMap="QualityOrderReportResult">