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; -- 统一在外部排序 + + + ORDER BY auditTime DESC + + + ORDER BY + taskStatus, + createTime DESC + +