From d2e2fe1b1a491d52549354058712977fad4bdb17 Mon Sep 17 00:00:00 2001
From: hayu <1604366271@qq.com>
Date: Mon, 15 Sep 2025 19:21:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../material/repair/RepairAuditDetailsMapper.xml  | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairAuditDetailsMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairAuditDetailsMapper.xml
index a942b6d8..f2efa20d 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairAuditDetailsMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairAuditDetailsMapper.xml
@@ -340,6 +340,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         tk.create_time AS createTime,
         tk.remark,
         tk.CODE AS repairNum,
+        rad.audit_time as auditTime,
         GROUP_CONCAT(DISTINCT mt4.type_id) AS firstId
         FROM
         tm_task tk
@@ -402,6 +403,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         tk.create_time AS createTime,
         tk.remark,
         tk.CODE AS repairNum,
+        rad.audit_time as auditTime,
         GROUP_CONCAT(DISTINCT mt4.type_id) AS firstId
         FROM
         tm_task tk
@@ -449,9 +451,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         GROUP BY
         tk.CODE
         ) AS combined_results
-        ORDER BY
-        taskStatus,
-        createTime DESC;  -- 统一在外部排序
+        <choose>
+            <when test="appTaskStatus != null and appTaskStatus == 11">
+                ORDER BY auditTime DESC
+            </when>
+            <otherwise>
+                ORDER BY
+                taskStatus,
+                createTime DESC
+            </otherwise>
+        </choose>
     </select>
 
     <select id="selectTypeNameByTaskId" resultType="java.lang.String">