|
@@ -123,10 +123,10 @@
|
|
|
<if test="startScore != null">
|
|
|
<choose>
|
|
|
<when test="startScore == 0">
|
|
|
- AND (ms.is_absent = 1 OR ms.is_breach = 1 OR ((ms.subjective_score + ms.objective_score) >= #{startScore} AND (ms.subjective_score + ms.objective_score) <= #{endScore}))
|
|
|
+ AND (ms.is_absent = 1 OR ms.is_breach = 1 OR ((ifnull(ms.subjective_score, 0) + ifnull(ms.objective_score, 0)) >= #{startScore} AND (ifnull(ms.subjective_score,0) + ifnull(ms.objective_score,0)) <= #{endScore}))
|
|
|
</when>
|
|
|
<otherwise>
|
|
|
- AND (ms.is_absent = 0 AND ms.is_breach = 0 AND ((ms.subjective_score + ms.objective_score) >= #{startScore} AND (ms.subjective_score + ms.objective_score) <= #{endScore}))
|
|
|
+ AND (ms.is_absent = 0 AND ms.is_breach = 0 AND ((ifnull(ms.subjective_score,0) + ifnull(ms.objective_score,0)) >= #{startScore} AND (ifnull(ms.subjective_score,0) + ifnull(ms.objective_score,0)) <= #{endScore}))
|
|
|
</otherwise>
|
|
|
</choose>
|
|
|
</if>
|