隐患考评调整

main
zhaokai 2026-04-01 15:30:26 +08:00
parent 458fd9b6c1
commit 4ed0d6b00f
1 changed files with 4 additions and 4 deletions

View File

@ -170,10 +170,10 @@
<!-- 隐患发现时间 --> <!-- 隐患发现时间 -->
<if test="params.findStartTime != null and params.findStartTime != ''"> <if test="params.findStartTime != null and params.findStartTime != ''">
AND h.hidden_find_time >= #{params.findStartTime} AND h.hidden_find_time >= DATE_FORMAT(CONCAT(#{params.findStartTime}, ' 00:00:00'), '%Y-%m-%d %H:%i:%s')
</if> </if>
<if test="params.findEndTime != null and params.findEndTime != ''"> <if test="params.findEndTime != null and params.findEndTime != ''">
AND h.hidden_find_time &lt;= #{params.findEndTime} AND h.hidden_find_time &lt; DATE_FORMAT(DATE_ADD(#{params.findEndTime}, INTERVAL 1 DAY), '%Y-%m-%d %H:%i:%s')
</if> </if>
<!-- 隐患类型 --> <!-- 隐患类型 -->
@ -232,10 +232,10 @@
<!-- 考评完成时间 --> <!-- 考评完成时间 -->
<if test="params.completeStartTime != null and params.completeStartTime != ''"> <if test="params.completeStartTime != null and params.completeStartTime != ''">
AND her.evaluation_time >= #{params.completeStartTime} AND her.evaluation_time >= DATE_FORMAT(CONCAT(#{params.completeStartTime}, ' 00:00:00'), '%Y-%m-%d %H:%i:%s')
</if> </if>
<if test="params.completeEndTime != null and params.completeEndTime != ''"> <if test="params.completeEndTime != null and params.completeEndTime != ''">
AND her.evaluation_time &lt;= #{params.completeEndTime} AND her.evaluation_time &lt; DATE_FORMAT(DATE_ADD(#{params.completeEndTime}, INTERVAL 1 DAY), '%Y-%m-%d %H:%i:%s')
</if> </if>
GROUP BY h.id GROUP BY h.id
ORDER BY h.hidden_find_time DESC ORDER BY h.hidden_find_time DESC