+今日完成历史待办

This commit is contained in:
wuyu 2023-12-01 18:37:23 +08:00
parent 618c685b17
commit c98ae6e6bc

View File

@ -81,30 +81,15 @@
*
FROM
pending_message_record
WHERE DATE (create_at) = DATE (#{selectDate})
WHERE (DATE(create_at) = DATE(#{selectDate}) <if test="isNowDay">
OR (DATE(create_at) <![CDATA[<]]> DATE(#{selectDate}) AND state = ('COMPLETED') AND DATE(update_at) = DATE(#{selectDate})
AND template_code IN <foreach collection="pendingCalendarCodeDTO.constructionCodes" index="index" item="item" open="(" separator="," close=")">#{item}</foreach>)
</if>)
AND state = 'COMPLETED'
AND is_delete = 0
AND executor_person_id = #{personId}
AND template_code IN <foreach collection="pendingCalendarCodeDTO.allCodes" index="index" item="item" open="(" separator="," close=")">#{item}</foreach>
ORDER BY create_at DESC) all_new_do) aa,(SELECT (@i:=0))tt
<if test="isNowDay">
UNION
ALL
SELECT (@i:=@i+1) mi,aa.* FROM
(SELECT
old_do.*,6 AS flag
FROM
(SELECT
*
FROM
pending_message_record
WHERE DATE(create_at) <![CDATA[<]]> DATE(#{selectDate})
AND (state = ('COMPLETED') AND update_at = DATE(#{selectDate}))
AND is_delete = 0
AND executor_person_id = #{personId}
AND template_code IN <foreach collection="pendingCalendarCodeDTO.constructionCodes" index="index" item="item" open="(" separator="," close=")">#{item}</foreach>
ORDER BY create_at DESC) old_do) aa,(SELECT (@i:=0))tt
</if>
) ccc ORDER BY flag ASC,mi asc
</select>
</mapper>