This commit is contained in:
parent
f32ff8cb6b
commit
d2e2fe1b1a
|
|
@ -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">
|
||||
|
|
|
|||
Loading…
Reference in New Issue