bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改

This commit is contained in:
hayu 2025-09-15 19:21:02 +08:00
parent f32ff8cb6b
commit d2e2fe1b1a
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairAuditDetailsMapper.xml
View File

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