调整请领单查询排序方式
This commit is contained in:
parent
038c2a5deb
commit
7ddc0ef0df
|
|
@ -33,7 +33,8 @@
|
||||||
LEFT JOIN sys_dict_item mainStatus ON mainStatus.dict_id = dict.id AND mainStatus.item_value = main.status
|
LEFT JOIN sys_dict_item mainStatus ON mainStatus.dict_id = dict.id AND mainStatus.item_value = main.status
|
||||||
<where>
|
<where>
|
||||||
<if test="dto.searchContent != null and dto.searchContent != ''">
|
<if test="dto.searchContent != null and dto.searchContent != ''">
|
||||||
AND (main.qld_no LIKE CONCAT('%', #{dto.searchContent}, '%') or tjEmp.realname LIKE CONCAT('%', #{dto.searchContent}, '%') )
|
AND (main.qld_no LIKE CONCAT('%', #{dto.searchContent}, '%') or tjEmp.realname LIKE CONCAT('%',
|
||||||
|
#{dto.searchContent}, '%') )
|
||||||
</if>
|
</if>
|
||||||
<if test="dto.status != null and dto.status != ''">
|
<if test="dto.status != null and dto.status != ''">
|
||||||
AND main.status = #{dto.status}
|
AND main.status = #{dto.status}
|
||||||
|
|
@ -45,7 +46,13 @@
|
||||||
AND main.elder_id = #{dto.elderId}
|
AND main.elder_id = #{dto.elderId}
|
||||||
</if>
|
</if>
|
||||||
</where>
|
</where>
|
||||||
ORDER BY main.update_time DESC, main.create_time DESC
|
ORDER BY
|
||||||
|
CASE
|
||||||
|
WHEN main.update_time IS NULL THEN 0
|
||||||
|
ELSE 1
|
||||||
|
END ASC,
|
||||||
|
COALESCE(main.update_time, '1970-01-01 00:00:00') DESC,
|
||||||
|
main.create_time DESC
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="selectLogsByQldNos" resultType="com.nu.modules.qld.entity.NuInvoicingQldLog">
|
<select id="selectLogsByQldNos" resultType="com.nu.modules.qld.entity.NuInvoicingQldLog">
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue